connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 4 ++--
dbaccess/source/core/dataaccess/documentevents.cxx | 2 +-
extensions/source/resource/ResourceIndexAccess.cxx | 2 +-
filter/source/msfilter/util.cxx | 6 +++---
sdext/source/pdfimport/sax/saxattrlist.cxx | 2 +-
sdext/source/pdfimport/services.cxx | 12 ++++++------
writerperfect/qa/unit/DirectoryStreamTest.cxx | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 018c6adf85097d07a0b0fbce3d7155ca5a369ae1
Author: Wastack <btom...@gmail.com>
Date: Fri Mar 11 00:49:47 2016 +0100
tdf#97966: Remove 'static' keywords
Change-Id: I0d9837a7ccecd606e0d43b53f8b920547b0d0bcd
Reviewed-on: https://gerrit.libreoffice.org/23132
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 24492f1..d3410ba 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::mozilla;
namespace
{
- static OUString lcl_getUserDataDirectory()
+ OUString lcl_getUserDataDirectory()
{
::osl::Security aSecurity;
OUString aConfigPath;
@@ -90,7 +90,7 @@ namespace
};
- static OUString lcl_guessProfileRoot( MozillaProductType _product )
+ OUString lcl_guessProfileRoot( MozillaProductType _product )
{
size_t productIndex = _product - 1;
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx
b/dbaccess/source/core/dataaccess/documentevents.cxx
index 3d00576..37d364d 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -73,7 +73,7 @@ namespace dbaccess
namespace
{
- static const DocumentEventData* lcl_getDocumentEventData()
+ const DocumentEventData* lcl_getDocumentEventData()
{
static const DocumentEventData s_aData[] = {
{ "OnCreate", true },
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx
b/extensions/source/resource/ResourceIndexAccess.cxx
index 63bfee9..5141b20 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::container;
namespace
{
- static std::shared_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs)
+ std::shared_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs)
{
if(rArgs.getLength()!=1)
return std::shared_ptr<ResMgr>();
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 6874111..89ab37a 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1231,7 +1231,7 @@ namespace
// Scheme means pattern of chromatic values.
// [2,2,1] -> red and green are approximately equal and blue is the dominant
color (e.g. blue)
// [1,1,1] -> all chromatic values are approximately equal (e.g. white, gray,
black)
-static void CalculateScheme(const BitmapColor& rBitmapColor, std::vector<int>
&vScheme, sal_uInt16 nVariance)
+void CalculateScheme(const BitmapColor& rBitmapColor, std::vector<int>
&vScheme, sal_uInt16 nVariance)
{
vScheme.resize(3,1);
if( rBitmapColor.GetRed() < rBitmapColor.GetGreen() + nVariance )
@@ -1248,7 +1248,7 @@ static void CalculateScheme(const BitmapColor&
rBitmapColor, std::vector<int> &v
++vScheme[2];
}
-static bool HasSimilarScheme(const BitmapColor& rBitmapColor1, const
BitmapColor& rBitmapColor2, sal_uInt16 nVariance)
+bool HasSimilarScheme(const BitmapColor& rBitmapColor1, const BitmapColor&
rBitmapColor2, sal_uInt16 nVariance)
{
std::vector<int> vScheme1, vScheme2;
CalculateScheme(rBitmapColor1, vScheme1, nVariance);
@@ -1262,7 +1262,7 @@ static bool HasSimilarScheme(const BitmapColor&
rBitmapColor1, const BitmapColor
}
// Find the best match in the color palette using scheme of the input color
-static sal_uInt16 GetBestIndex(const BitmapPalette& rPalette, const
BitmapColor& rBitmapColor)
+sal_uInt16 GetBestIndex(const BitmapPalette& rPalette, const BitmapColor&
rBitmapColor)
{
sal_uInt16 nReturn = 0;
sal_uInt16 nLastErr = SAL_MAX_UINT16;
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx
b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 87d804b..6fa5db9 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -48,7 +48,7 @@ SaxAttrList::~SaxAttrList()
}
namespace {
- static OUString getCDATAString()
+ OUString getCDATAString()
{
return OUString( "CDATA" );
}
diff --git a/sdext/source/pdfimport/services.cxx
b/sdext/source/pdfimport/services.cxx
index 834964f..52916d2 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -33,12 +33,12 @@ using namespace ::com::sun::star::registry;
namespace
{
- static Reference< XInterface > Create_PDFIHybridAdaptor( const Reference<
XComponentContext >& _rxContext )
+ Reference< XInterface > Create_PDFIHybridAdaptor( const Reference<
XComponentContext >& _rxContext )
{
return *(new pdfi::PDFIHybridAdaptor( _rxContext ));
}
- static Reference< XInterface > Create_PDFIRawAdaptor_Writer( const
Reference< XComponentContext >& _rxContext )
+ Reference< XInterface > Create_PDFIRawAdaptor_Writer( const Reference<
XComponentContext >& _rxContext )
{
pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor(
"org.libreoffice.comp.documents.WriterPDFImport", _rxContext );
@@ -48,7 +48,7 @@ namespace
return
uno::Reference<uno::XInterface>(static_cast<xml::XImportFilter*>(pAdaptor));
}
- static Reference< XInterface > Create_PDFIRawAdaptor_Draw( const
Reference< XComponentContext >& _rxContext )
+ Reference< XInterface > Create_PDFIRawAdaptor_Draw( const Reference<
XComponentContext >& _rxContext )
{
pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor(
"org.libreoffice.comp.documents.DrawPDFImport", _rxContext );
@@ -57,7 +57,7 @@ namespace
return
uno::Reference<uno::XInterface>(static_cast<xml::XImportFilter*>(pAdaptor));
}
- static Reference< XInterface > Create_PDFIRawAdaptor_Impress( const
Reference< XComponentContext >& _rxContext )
+ Reference< XInterface > Create_PDFIRawAdaptor_Impress( const Reference<
XComponentContext >& _rxContext )
{
pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor(
"org.libreoffice.comp.documents.ImpressPDFImport", _rxContext );
@@ -66,7 +66,7 @@ namespace
return
uno::Reference<uno::XInterface>(static_cast<xml::XImportFilter*>(pAdaptor));
}
- static Reference< XInterface > Create_PDFDetector( const Reference<
XComponentContext >& _rxContext )
+ Reference< XInterface > Create_PDFDetector( const Reference<
XComponentContext >& _rxContext )
{
return *(new pdfi::PDFDetector( _rxContext ) );
}
@@ -96,7 +96,7 @@ namespace
}
};
- static const ComponentDescription* lcl_getComponents()
+ const ComponentDescription* lcl_getComponents()
{
static const ComponentDescription aDescriptions[] = {
ComponentDescription( "com.sun.star.document.ImportFilter",
"org.libreoffice.comp.documents.HybridPDFImport", Create_PDFIHybridAdaptor ),
diff --git a/writerperfect/qa/unit/DirectoryStreamTest.cxx
b/writerperfect/qa/unit/DirectoryStreamTest.cxx
index 1331932..9201cdd 100644
--- a/writerperfect/qa/unit/DirectoryStreamTest.cxx
+++ b/writerperfect/qa/unit/DirectoryStreamTest.cxx
@@ -62,7 +62,7 @@ static const char g_aDirPath[] =
"/writerperfect/qa/unit/data/stream/test.dir";
static const char g_aNondirPath[] =
"/writerperfect/qa/unit/data/stream/test.dir/mimetype";
static const char g_aNonexistentPath[] =
"/writerperfect/qa/unit/data/stream/foo/bar";
-static DirectoryStream *createForParent(const
css::uno::Reference<css::ucb::XContent> &xContent)
+DirectoryStream *createForParent(const css::uno::Reference<css::ucb::XContent>
&xContent)
{
try
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
