[Libreoffice-commits] core.git: chart2/source comphelper/source forms/source framework/source l10ntools/source sw/source tools/source
Wastack
btomi96 at gmail.com
Fri Mar 11 08:59:56 UTC 2016
chart2/source/model/template/PieChartType.cxx | 2 +-
comphelper/source/property/propertystatecontainer.cxx | 2 +-
forms/source/richtext/clipboarddispatcher.cxx | 2 +-
forms/source/richtext/parametrizedattributedispatcher.cxx | 2 +-
forms/source/richtext/richtextimplcontrol.cxx | 2 +-
framework/source/uielement/statusbaritem.cxx | 2 +-
framework/source/uifactory/addonstoolbarfactory.cxx | 2 +-
l10ntools/source/propmerge.cxx | 6 +++---
sw/source/core/crsr/crbm.cxx | 4 ++--
tools/source/misc/cpuid.cxx | 4 ++--
10 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ce549d2a09ad9884a7e598162cf0ca6b6bc3150c
Author: Wastack <btomi96 at gmail.com>
Date: Fri Mar 11 01:07:08 2016 +0100
tdf#97966: Remove 'static' keywords
Change-Id: Iced527f48afa828cc9acf5b6461674a2706cbcd7
Reviewed-on: https://gerrit.libreoffice.org/23135
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Tested-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index f036ebc..b95d083 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -46,7 +46,7 @@ enum
PROP_PIECHARTTYPE_3DRELATIVEHEIGHT
};
-static void lcl_AddPropertiesToVector(
+void lcl_AddPropertiesToVector(
::std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index 01cfe36..b315a66 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -31,7 +31,7 @@ namespace comphelper
namespace
{
- static OUString lcl_getUnknownPropertyErrorMessage( const OUString& _rPropertyName )
+ OUString lcl_getUnknownPropertyErrorMessage( const OUString& _rPropertyName )
{
// TODO: perhaps it's time to think about resources in the comphelper module?
// Would be nice to have localized exception strings (a simply resource file containing
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 09cbdbc..00d5ade 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -38,7 +38,7 @@ namespace frm
namespace
{
- static URL createClipboardURL( OClipboardDispatcher::ClipboardFunc _eFunc )
+ URL createClipboardURL( OClipboardDispatcher::ClipboardFunc _eFunc )
{
URL aURL;
switch ( _eFunc )
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 47fe59a..607cba9 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -53,7 +53,7 @@ namespace frm
namespace
{
- static SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId )
+ SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId )
{
switch ( _nSlotId )
{
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 24c5b04..6bb6849 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -543,7 +543,7 @@ namespace frm
namespace
{
- static void lcl_inflate( Rectangle& _rRect, long _nInflateX, long _nInflateY )
+ void lcl_inflate( Rectangle& _rRect, long _nInflateX, long _nInflateY )
{
_rRect.Left() -= _nInflateX;
_rRect.Right() += _nInflateX;
diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx
index c33bd04..a69baac 100644
--- a/framework/source/uielement/statusbaritem.cxx
+++ b/framework/source/uielement/statusbaritem.cxx
@@ -33,7 +33,7 @@ namespace framework
namespace
{
-static sal_uInt16 impl_convertItemBitsToItemStyle( sal_Int16 nItemBits )
+sal_uInt16 impl_convertItemBitsToItemStyle( sal_Int16 nItemBits )
{
sal_uInt16 nStyle( 0 );
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index c1356d5..2003669 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -98,7 +98,7 @@ AddonsToolBarFactory::~AddonsToolBarFactory()
{
}
-static bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList )
+bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList )
{
if ( aContextList.isEmpty() )
return true;
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 44e8792..78680e8 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -20,7 +20,7 @@
namespace
{
//Find ascii escaped unicode
- static sal_Int32 lcl_IndexOfUnicode(
+ sal_Int32 lcl_IndexOfUnicode(
const OString& rSource, const sal_Int32 nFrom = 0 )
{
const OString sHexDigits = "0123456789abcdefABCDEF";
@@ -41,7 +41,7 @@ namespace
}
//Convert ascii escaped unicode to utf-8
- static OString lcl_ConvertToUTF8( const OString& rText )
+ OString lcl_ConvertToUTF8( const OString& rText )
{
OString sResult = rText;
sal_Int32 nIndex = lcl_IndexOfUnicode( sResult );
@@ -59,7 +59,7 @@ namespace
}
//Escape unicode characters
- static void lcl_PrintJavaStyle( const OString& rText, std::ofstream &rOfstream )
+ void lcl_PrintJavaStyle( const OString& rText, std::ofstream &rOfstream )
{
const OUString sTemp =
OStringToOUString( rText, RTL_TEXTENCODING_UTF8 );
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 89afac3..bd82a24 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -64,13 +64,13 @@ namespace
SwCursorSaveState m_aSaveState;
};
- static bool lcl_ReverseMarkOrderingByEnd(const IDocumentMarkAccess::pMark_t& rpFirst,
+ bool lcl_ReverseMarkOrderingByEnd(const IDocumentMarkAccess::pMark_t& rpFirst,
const IDocumentMarkAccess::pMark_t& rpSecond)
{
return rpFirst->GetMarkEnd() > rpSecond->GetMarkEnd();
}
- static bool lcl_IsInvisibleBookmark(IDocumentMarkAccess::pMark_t pMark)
+ bool lcl_IsInvisibleBookmark(IDocumentMarkAccess::pMark_t pMark)
{
return IDocumentMarkAccess::GetType(*pMark) != IDocumentMarkAccess::MarkType::BOOKMARK;
}
diff --git a/tools/source/misc/cpuid.cxx b/tools/source/misc/cpuid.cxx
index 9cdc499..5bef56c 100644
--- a/tools/source/misc/cpuid.cxx
+++ b/tools/source/misc/cpuid.cxx
@@ -22,13 +22,13 @@ namespace
{
#if defined(_MSC_VER)
#include <intrin.h>
-static void getCpuId(uint32_t array[4])
+void getCpuId(uint32_t array[4])
{
__cpuid((int*)array, 1);
}
#else
#include <cpuid.h>
-static void getCpuId(uint32_t array[4])
+void getCpuId(uint32_t array[4])
{
__get_cpuid(1, array + 0, array + 1, array + 2, array + 3);
}
More information about the Libreoffice-commits
mailing list