[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang desktop/inc desktop/source i18npool/inc i18npool/source include/o3tl include/svtools include/tools linguistic/source package/inc package/source sc/uiconfig tools/source
Clément Lassieur
clement at lassieur.org
Thu Apr 9 01:13:38 PDT 2015
compilerplugins/clang/staticmethods.cxx | 5 +++
desktop/inc/app.hxx | 22 +++++++-------
desktop/source/app/app.cxx | 2 -
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6 +--
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 4 +-
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 4 +-
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 2 -
desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 4 +-
desktop/source/deployment/manager/dp_extensionmanager.cxx | 2 -
desktop/source/deployment/manager/dp_extensionmanager.hxx | 4 +-
desktop/source/deployment/manager/dp_manager.h | 2 -
desktop/source/deployment/manager/dp_properties.hxx | 2 -
desktop/source/migration/migration.cxx | 2 -
desktop/source/migration/migration_impl.hxx | 20 ++++++------
desktop/source/splash/splash.cxx | 2 -
i18npool/inc/numberformatcode.hxx | 2 -
i18npool/inc/transliteration_Ignore.hxx | 2 -
i18npool/source/search/levdis.hxx | 10 +++---
include/o3tl/enumarray.hxx | 2 -
include/svtools/svlbitm.hxx | 4 --
include/tools/urlobj.hxx | 5 +--
linguistic/source/convdic.hxx | 2 -
linguistic/source/dicimp.hxx | 8 ++---
linguistic/source/hyphdsp.hxx | 4 +-
linguistic/source/spelldsp.hxx | 2 -
package/inc/ZipPackage.hxx | 2 -
package/inc/zipfileaccess.hxx | 4 +-
package/source/manifest/ManifestImport.hxx | 2 -
package/source/xstor/xstorage.hxx | 2 -
sc/uiconfig/scalc/ui/subtotalgrppage.ui | 3 +
tools/source/fsys/urlobj.cxx | 6 +--
31 files changed, 73 insertions(+), 70 deletions(-)
New commits:
commit 3c00e75c1437fc666baa72bd550f7d4a4e6918eb
Author: Clément Lassieur <clement at lassieur.org>
Date: Wed Apr 8 21:01:07 2015 +0200
add Product function to Subtotals UI
Change-Id: I240859bafa953c75ee639ccb77305161274217d1
Reviewed-on: https://gerrit.libreoffice.org/15210
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/uiconfig/scalc/ui/subtotalgrppage.ui b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
index bb8cc39..d8085ec 100644
--- a/sc/uiconfig/scalc/ui/subtotalgrppage.ui
+++ b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
@@ -24,6 +24,9 @@
<col id="0" translatable="yes">Min</col>
</row>
<row>
+ <col id="0" translatable="yes">Product</col>
+ </row>
+ <row>
<col id="0" translatable="yes">Count (numbers only)</col>
</row>
<row>
commit 35163715ead39eece619a5790903c88fa4216ec6
Author: Noel Grandin <noel at peralex.com>
Date: Tue Apr 7 13:16:24 2015 +0200
loplugin:staticmethods
Change-Id: Ie348778ea666c24e95e048386547f301083a0017
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index eb5c06b..243666d 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -133,6 +133,11 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
if (startsWith(getFilename(pCXXMethodDecl->getCanonicalDecl()->getLocStart()), SRCDIR "/include/svl")) {
return true;
}
+ // another one of those classes that has static data and some kind of weird reference-counting trick in it's constructor
+ if (aParentName == "LinguOptions") {
+ return true;
+ }
+
bVisitedThis = false;
TraverseStmt(pCXXMethodDecl->getBody());
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 22c40f8..4a98c6e 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -89,7 +89,7 @@ class Desktop : public Application
static ResMgr* GetDesktopResManager();
static CommandLineArgs& GetCommandLineArgs();
- void HandleBootstrapErrors(
+ static void HandleBootstrapErrors(
BootstrapError nError, OUString const & aMessage );
void SetBootstrapError(
BootstrapError nError, OUString const & aMessage )
@@ -127,21 +127,21 @@ class Desktop : public Application
private:
void RegisterServices(
css::uno::Reference< css::uno::XComponentContext > const & context);
- void DeregisterServices();
+ static void DeregisterServices();
- void CreateTemporaryDirectory();
- void RemoveTemporaryDirectory();
+ static void CreateTemporaryDirectory();
+ static void RemoveTemporaryDirectory();
bool InitializeInstallation( const OUString& rAppFilename );
- bool InitializeConfiguration();
- void FlushConfiguration();
- bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
+ static bool InitializeConfiguration();
+ static void FlushConfiguration();
+ static bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg );
+ static void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg );
void StartSetup( const OUString& aParameters );
// Create a error message depending on bootstrap failure code and an optional file url
- OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode,
+ static OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode,
const OUString& aFileURL );
static void PreloadModuleData( const CommandLineArgs& );
@@ -151,7 +151,7 @@ class Desktop : public Application
void OpenSplashScreen();
void CloseSplashScreen();
- void EnableOleAutomation();
+ static void EnableOleAutomation();
DECL_LINK( ImplInitFilterHdl, ConvertData* );
DECL_LINK( AsyncInitFirstRun, void* );
/** checks if the office is run the first time
@@ -161,7 +161,7 @@ class Desktop : public Application
void CheckFirstRun( );
/// does initializations which are necessary for the first run of the office
- void DoFirstRunInitializations();
+ static void DoFirstRunInitializations();
static void ShowBackingComponent(Desktop * progress);
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 9756394..d0e5324 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1728,7 +1728,7 @@ bool Desktop::InitializeConfiguration()
}
catch( ::com::sun::star::lang::ServiceNotRegisteredException & e )
{
- this->HandleBootstrapErrors(
+ HandleBootstrapErrors(
Desktop::BE_UNO_SERVICE_CONFIG_MISSING, e.Message );
}
catch( const ::com::sun::star::configuration::MissingBootstrapFileException& e )
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 5fc6346..bd23920 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1142,7 +1142,7 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt )
bool ExtMgrDialog::Close()
{
- bool bRet = m_pManager->queryTermination();
+ bool bRet = TheExtensionManager::queryTermination();
if ( bRet )
{
bRet = ModelessDialog::Close();
@@ -1477,7 +1477,7 @@ bool UpdateRequiredDialog::Close()
// Check dependencies of all packages
-bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage > &xPackage ) const
+bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage > &xPackage )
{
bool bRegistered = false;
try {
@@ -1505,7 +1505,7 @@ bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage
}
// Checks the dependencies no matter if the extension is enabled or disabled!
-bool UpdateRequiredDialog::checkDependencies( const uno::Reference< deployment::XPackage > &xPackage ) const
+bool UpdateRequiredDialog::checkDependencies( const uno::Reference< deployment::XPackage > &xPackage )
{
bool bDependenciesValid = false;
try {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index f83fd29..0db6be0 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -204,8 +204,8 @@ class UpdateRequiredDialog : public ModalDialog,
DECL_DLLPRIVATE_LINK( startProgress, void * );
DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
- bool isEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
- bool checkDependencies( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
+ static bool isEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+ static bool checkDependencies( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
bool hasActiveEntries();
void disableAllEntries();
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 1158087..260100f 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -995,7 +995,7 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &
bool bLicenseMissing )
{
long nPos = 0;
- PackageState eState = m_pManager->getPackageState( xPackage );
+ PackageState eState = TheExtensionManager::getPackageState( xPackage );
bool bLocked = m_pManager->isReadOnly( xPackage );
TEntry_Impl pEntry( new Entry_Impl( xPackage, eState, bLocked ) );
@@ -1054,7 +1054,7 @@ void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage
{
if ( (*iIndex)->m_xPackage == xPackage )
{
- PackageState eState = m_pManager->getPackageState( xPackage );
+ PackageState eState = TheExtensionManager::getPackageState( xPackage );
(*iIndex)->m_bHasOptions = m_pManager->supportsOptions( xPackage );
(*iIndex)->m_eState = eState;
(*iIndex)->m_sTitle = xPackage->getDisplayName();
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index b8b5ba9..f3584d0 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -318,7 +318,7 @@ void TheExtensionManager::createPackageList()
}
-PackageState TheExtensionManager::getPackageState( const uno::Reference< deployment::XPackage > &xPackage ) const
+PackageState TheExtensionManager::getPackageState( const uno::Reference< deployment::XPackage > &xPackage )
{
try {
beans::Optional< beans::Ambiguous< sal_Bool > > option(
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index f5e1665..67836b2 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -85,12 +85,12 @@ public:
bool installPackage( const OUString &rPackageURL, bool bWarnUser = false );
void createPackageList();
- bool queryTermination();
+ static bool queryTermination();
void terminateDialog();
// Tools
bool supportsOptions( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
- PackageState getPackageState( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
+ static PackageState getPackageState( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const { return m_xContext; }
::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > getExtensionManager() const { return m_xExtensionManager; }
bool isReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index cf61aec..5aed75e 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -79,7 +79,7 @@ struct CompIdentifiers
return false;
}
- OUString getName(::std::vector<Reference<css::deployment::XPackage> > const & a);
+ static OUString getName(::std::vector<Reference<css::deployment::XPackage> > const & a);
};
OUString CompIdentifiers::getName(::std::vector<Reference<css::deployment::XPackage> > const & a)
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 32856ca..47a3e96 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -233,7 +233,7 @@ private:
bool isUserDisabled(OUString const & identifier,
OUString const & filename);
- bool isUserDisabled(
+ static bool isUserDisabled(
css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > const & seqExtSameId);
void activateExtension(
@@ -243,7 +243,7 @@ private:
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv);
- void activateExtension(
+ static void activateExtension(
css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > const & seqExt,
bool bUserDisabled, bool bStartup,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 168225d..e90ab8d 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -72,7 +72,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
void insertToActivationLayerDB(
OUString const & id, ActivePackages::Data const & dbData );
- void deletePackageFromCache(
+ static void deletePackageFromCache(
css::uno::Reference<css::deployment::XPackage> const & xPackage,
OUString const & destFolder );
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index c342859..b8f059f 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -43,7 +43,7 @@ protected:
::boost::optional< OUString> m_prop_suppress_license;
::boost::optional< OUString> m_prop_extension_update;
- OUString getPropertyValue(css::beans::NamedValue const & v);
+ static OUString getPropertyValue(css::beans::NamedValue const & v);
public:
virtual ~ExtensionProperties() {};
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 15d3b5b..93ebeb1 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -634,7 +634,7 @@ sal_Int32 MigrationImpl::findPreferredMigrationProcess(const migrations_availabl
return nIndex;
}
-strings_vr MigrationImpl::applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const
+strings_vr MigrationImpl::applyPatterns(const strings_v& vSet, const strings_v& vPatterns)
{
using namespace utl;
strings_vr vrResult(new strings_v);
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 4ab6708..6b0fc45 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -197,21 +197,21 @@ private:
OUString m_sModuleIdentifier;
// functions to control the migration process
- bool readAvailableMigrations(migrations_available&);
+ static bool readAvailableMigrations(migrations_available&);
bool alreadyMigrated();
- migrations_vr readMigrationSteps(const OUString& rMigrationName);
+ static migrations_vr readMigrationSteps(const OUString& rMigrationName);
sal_Int32 findPreferredMigrationProcess(const migrations_available&);
#if defined UNX && ! defined MACOSX
- OUString preXDGConfigDir(const OUString& rConfigDir);
+ static OUString preXDGConfigDir(const OUString& rConfigDir);
#endif
- void setInstallInfoIfExist(install_info& aInfo, const OUString& rConfigDir, const OUString& rVersion);
- install_info findInstallation(const strings_v& rVersions);
+ static void setInstallInfoIfExist(install_info& aInfo, const OUString& rConfigDir, const OUString& rVersion);
+ static install_info findInstallation(const strings_v& rVersions);
strings_vr compileFileList();
// helpers
strings_vr getAllFiles(const OUString& baseURL) const;
- strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const;
- css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, bool rw=false);
+ static strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns);
+ static css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, bool rw=false);
::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
void compareOldAndNewConfig(const OUString& sParentNodeName,
@@ -227,10 +227,10 @@ private:
void copyFiles();
void copyConfig();
void runServices();
- void refresh();
+ static void refresh();
- void setMigrationCompleted();
- bool checkMigrationCompleted();
+ static void setMigrationCompleted();
+ static bool checkMigrationCompleted();
public:
MigrationImpl();
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 2649c24..f230372 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -58,7 +58,7 @@ private:
void loadConfig();
void updateStatus();
void SetScreenBitmap(BitmapEx &rBitmap);
- void determineProgressRatioValues( double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight );
+ static void determineProgressRatioValues( double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight );
static osl::Mutex _aMutex;
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index 511a765..e6c6e54 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -65,7 +65,7 @@ private:
static OUString mapElementTypeShortToString(sal_Int16 formatType);
static sal_Int16 mapElementTypeStringToShort(const OUString& formatType);
static OUString mapElementUsageShortToString(sal_Int16 formatUsage);
- sal_Int16 mapElementUsageStringToShort(const OUString& formatUsage);
+ static sal_Int16 mapElementUsageStringToShort(const OUString& formatUsage);
void createLocaleDataObject();
};
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index b610bf6..5cec8d4 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -57,7 +57,7 @@ public:
throw(com::sun::star::uno::RuntimeException,
com::sun::star::i18n::MultipleCharsOutputException, std::exception) SAL_OVERRIDE;
- com::sun::star::uno::Sequence< OUString > SAL_CALL
+ static com::sun::star::uno::Sequence< OUString > SAL_CALL
transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 )
throw(com::sun::star::uno::RuntimeException);
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx
index 426e722..9530ab9 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -142,11 +142,11 @@ class WLevDistance
bool bSplitCount; ///< if TRUE, Rep/Ins/Del are counted separately
void InitData( const sal_Unicode* cPattern );
- inline int Min3( int x, int y, int z ); ///< minimum value of 3 values
- int Mid3( int x, int y, int z ); ///< middle value of 3 values
- int Max3( int x, int y, int z ); ///< maximum value of 3 values
- int GCD( int a, int b ); ///< Greatest Common Divisor
- int LCM( int a, int b ); ///< Least Common Multiple
+ static inline int Min3( int x, int y, int z ); ///< minimum value of 3 values
+ static int Mid3( int x, int y, int z ); ///< middle value of 3 values
+ static int Max3( int x, int y, int z ); ///< maximum value of 3 values
+ static int GCD( int a, int b ); ///< Greatest Common Divisor
+ static int LCM( int a, int b ); ///< Least Common Multiple
public:
diff --git a/include/o3tl/enumarray.hxx b/include/o3tl/enumarray.hxx
index 76fdec1..777e205 100644
--- a/include/o3tl/enumarray.hxx
+++ b/include/o3tl/enumarray.hxx
@@ -66,7 +66,7 @@ public:
void fill(V val)
{ for (size_type i=0; i<=max_index; ++i) detail_values[i] = val; }
- size_type size() const { return max_index + 1; }
+ static size_type size() { return max_index + 1; }
iterator begin() { return iterator(*this, 0); }
iterator end() { return iterator(*this, size()); }
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index 4e08291..e0cd847 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -123,10 +123,6 @@ public:
{
return maText;
}
- OUString GetExtendText() const
- {
- return OUString();
- }
void SetText(const OUString& rText)
{
maText = rText;
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 6a3c3a1..f138514 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -853,9 +853,8 @@ public:
// POP3 and URLs:
- OUString GetMsgId(DecodeMechanism eMechanism = DECODE_TO_IURI,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
- const;
+ static OUString GetMsgId(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
// Coding:
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 5b30e67..8eae426 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -102,7 +102,7 @@ protected:
ConvDic(const ConvDic &);
ConvDic & operator = (const ConvDic &);
- ConvMap::iterator GetEntry( ConvMap &rMap, const OUString &rFirstText, const OUString &rSecondText );
+ static ConvMap::iterator GetEntry( ConvMap &rMap, const OUString &rFirstText, const OUString &rSecondText );
void Load();
void Save();
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index fc6647c..9a02ab3 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -68,14 +68,14 @@ class DictionaryNeo :
sal_uLong loadEntries(const OUString &rMainURL);
sal_uLong saveEntries(const OUString &rMainURL);
- int cmpDicEntry(const OUString &rWord1,
+ static int cmpDicEntry(const OUString &rWord1,
const OUString &rWord2,
bool bSimilarOnly = false);
- bool seekEntry(const OUString &rWord, sal_Int32 *pPos,
+ bool seekEntry(const OUString &rWord, sal_Int32 *pPos,
bool bSimilarOnly = false);
bool isSorted();
- bool addEntry_Impl(const ::com::sun::star::uno::Reference<
+ bool addEntry_Impl(const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry >& rDicEntry,
bool bIsLoadEntries = false);
@@ -191,7 +191,7 @@ class DicEntry :
DicEntry(const DicEntry &) SAL_DELETED_FUNCTION;
DicEntry & operator = (const DicEntry &) SAL_DELETED_FUNCTION;
- void splitDicFileWord(const OUString &rDicFileWord,
+ static void splitDicFileWord(const OUString &rDicFileWord,
OUString &rDicWord,
OUString &rReplacement);
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index dd5e245..80981fc 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -72,14 +72,14 @@ class HyphenatorDispatcher :
void ClearSvcList();
- com::sun::star::uno::Reference<
+ static com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord>
buildHyphWord( const OUString& rOrigWord,
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry> &xEntry,
sal_Int16 nLang, sal_Int16 nMaxLeading );
- com::sun::star::uno::Reference<
+ static com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XPossibleHyphens >
buildPossHyphens( const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry > &xEntry,
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 5b975e3..c57382b 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -122,7 +122,7 @@ public:
private:
void setCharClass(const LanguageTag& rLanguageTag);
- OUString SAL_CALL makeLowerCase(const OUString&, CharClass *);
+ static OUString SAL_CALL makeLowerCase(const OUString&, CharClass *);
};
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 1ac84f1..3e03b13 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -161,7 +161,7 @@ public:
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId( void )
+ static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId()
throw(::com::sun::star::uno::RuntimeException);
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 33d3f33..553d4cb 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -59,9 +59,9 @@ public:
virtual ~OZipFileAccess();
- ::com::sun::star::uno::Sequence< OUString > GetPatternsFromString_Impl( const OUString& aString );
+ static ::com::sun::star::uno::Sequence< OUString > GetPatternsFromString_Impl( const OUString& aString );
- bool StringGoodForPattern_Impl( const OUString& aString,
+ static bool StringGoodForPattern_Impl( const OUString& aString,
const ::com::sun::star::uno::Sequence< OUString >& aPattern );
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index dd7498b..2315135 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -117,7 +117,7 @@ protected:
OUString PushNameAndNamespaces( const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs,
StringHashMap& o_aConvertedAttribs );
- OUString ConvertNameWithNamespace( const OUString& aName, const StringHashMap& aNamespaces );
+ static OUString ConvertNameWithNamespace( const OUString& aName, const StringHashMap& aNamespaces );
OUString ConvertName( const OUString& aName );
public:
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index c8688ec..4e1283a 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -249,7 +249,7 @@ struct OStorage_Impl
::com::sun::star::uno::Sequence< OUString > GetElementNames();
void RemoveElement( SotElement_Impl* pElement );
- void ClearElement( SotElement_Impl* pElement );
+ static void ClearElement( SotElement_Impl* pElement );
void DisposeChildren();
void CloneStreamElement(
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 330d90d..f6cbcef 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3660,7 +3660,7 @@ bool INetURLObject::operator ==(INetURLObject const & rObject) const
|| GetPort() != rObject.GetPort()
|| HasParam() != rObject.HasParam()
|| GetParam(NO_DECODE) != rObject.GetParam(NO_DECODE)
- || GetMsgId(NO_DECODE) != rObject.GetMsgId(NO_DECODE))
+ || GetMsgId(NO_DECODE) != INetURLObject::GetMsgId(NO_DECODE))
return false;
OUString aPath1(GetURLPath(NO_DECODE));
OUString aPath2(rObject.GetURLPath(NO_DECODE));
@@ -3740,7 +3740,7 @@ bool INetURLObject::operator <(INetURLObject const & rObject) const
return true;
else if (nCompare > 0)
return false;
- return GetMsgId(NO_DECODE).compareTo(rObject.GetMsgId(NO_DECODE)) < 0;
+ return GetMsgId(NO_DECODE).compareTo(INetURLObject::GetMsgId(NO_DECODE)) < 0;
}
bool INetURLObject::ConcatData(INetProtocol eTheScheme,
@@ -4568,7 +4568,7 @@ OUString INetURLObject::getFSysPath(FSysStyle eStyle,
}
OUString INetURLObject::GetMsgId(DecodeMechanism,
- rtl_TextEncoding) const
+ rtl_TextEncoding)
{
return OUString();
}
More information about the Libreoffice-commits
mailing list