API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Dec 11th, 2018
178
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.35 KB | None | 0 0
raw download clone embed print report
  1. lera@infineco:~/projects/LibreOffice$ git diff master                                                                                                                                        
  2. diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
  3. index 2291aeb171f4..2201e87040c4 100644
  4. --- a/desktop/source/app/app.cxx
  5. +++ b/desktop/source/app/app.cxx
  6. @@ -2180,6 +2180,8 @@ void Desktop::OpenDefault()
  7.              aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::IMPRESS );
  8.          else if ( rArgs.IsBase() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) )
  9.              aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DATABASE );
  10. +        else if (rArgs.IsBasicIDE() && aOpt.IsModuleInstalled(SvtModuleOptions::EModule::BASIC))
  11. +            aName = aOpt.GetFactoryEmptyDocumentURL(SvtModuleOptions::EFactory::BASIC);
  12.          else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) )
  13.              aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DRAW );
  14.          else if ( rArgs.IsMath() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) )
  15. @@ -2436,6 +2438,8 @@ void Desktop::OpenSplashScreen()
  16.              aAppName = "impress";
  17.          else if ( rCmdLine.IsBase() )
  18.              aAppName = "base";
  19. +        else if (rCmdLine.IsBase())
  20. +            aAppName = "basic";
  21.          else if ( rCmdLine.IsGlobal() )
  22.              aAppName = "global";
  23.          else if ( rCmdLine.IsMath() )
  24. diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
  25. index 52f96dd84d88..be327e24c52b 100644
  26. --- a/desktop/source/app/cmdlineargs.cxx
  27. +++ b/desktop/source/app/cmdlineargs.cxx
  28. @@ -492,6 +492,11 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
  29.                  m_base = true;
  30.                  m_bDocumentArgs = true;
  31.              }
  32. +            else if ( oArg == "basicide" )
  33. +            {
  34. +                m_bBasicIDE = true;
  35. +                m_bDocumentArgs = true;
  36. +            }
  37.              else if ( oArg == "global" )
  38.              {
  39.                  m_global = true;
  40. @@ -714,6 +719,7 @@ void CommandLineArgs::InitParamValues()
  41.      m_math = false;
  42.      m_web = false;
  43.      m_base = false;
  44. +    m_bBasicIDE = false;
  45.      m_helpwriter = false;
  46.      m_helpcalc = false;
  47.      m_helpdraw = false;
  48. @@ -733,7 +739,7 @@ void CommandLineArgs::InitParamValues()
  49.  bool CommandLineArgs::HasModuleParam() const
  50.  {
  51.      return m_writer || m_calc || m_draw || m_impress || m_global || m_math
  52. -        || m_web || m_base;
  53. +        || m_web || m_base || m_bBasicIDE;
  54.  }
  55.  
  56.  std::vector< OUString > CommandLineArgs::GetOpenList() const
  57. diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
  58. index 94600ed40972..0852b99b6878 100644
  59. --- a/desktop/source/app/cmdlineargs.hxx
  60. +++ b/desktop/source/app/cmdlineargs.hxx
  61. @@ -86,6 +86,7 @@ class CommandLineArgs
  62.          bool                IsDraw() const { return m_draw;}
  63.          bool                IsImpress() const { return m_impress;}
  64.          bool                IsBase() const { return m_base;}
  65. +        bool                IsBasicIDE() const { return m_bBasicIDE;}
  66.          bool                IsGlobal() const { return m_global;}
  67.          bool                IsMath() const { return m_math;}
  68.          bool                IsWeb() const { return m_web;}
  69. @@ -149,6 +150,7 @@ class CommandLineArgs
  70.          bool m_math;
  71.          bool m_web;
  72.          bool m_base;
  73. +        bool m_bBasicIDE;
  74.          bool m_helpwriter;
  75.          bool m_helpcalc;
  76.          bool m_helpdraw;
  77. diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
  78. index 7bfcede60714..8603206bd3e9 100644
  79. --- a/unotools/source/config/moduleoptions.cxx
  80. +++ b/unotools/source/config/moduleoptions.cxx
  81. @@ -1139,6 +1139,8 @@ OUString SvtModuleOptions::GetDefaultModuleName() const
  82.          aModule = GetFactoryShortName(SvtModuleOptions::EFactory::WRITERGLOBAL);
  83.      else if (m_pImpl->IsModuleInstalled(SvtModuleOptions::EModule::MATH))
  84.          aModule = GetFactoryShortName(SvtModuleOptions::EFactory::MATH);
  85. +    else if (m_pImpl->IsModuleInstalled(SvtModuleOptions::EModule::BASIC))
  86. +        aModule = GetFactoryShortName(SvtModuleOptions::EFactory::BASIC);
  87.      return aModule;
  88.  }
  89.  
  90. lera@infineco:~/projects/LibreOffice$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!