tdf#97966: Remove 'static' keywords
Change-Id: Iced527f48afa828cc9acf5b6461674a2706cbcd7 Reviewed-on: https://gerrit.libreoffice.org/23135 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
committed by
Stephan Bergmann
parent
9a13cff647
commit
ce549d2a09
@@ -46,7 +46,7 @@ enum
|
|||||||
PROP_PIECHARTTYPE_3DRELATIVEHEIGHT
|
PROP_PIECHARTTYPE_3DRELATIVEHEIGHT
|
||||||
};
|
};
|
||||||
|
|
||||||
static void lcl_AddPropertiesToVector(
|
void lcl_AddPropertiesToVector(
|
||||||
::std::vector< Property > & rOutProperties )
|
::std::vector< Property > & rOutProperties )
|
||||||
{
|
{
|
||||||
rOutProperties.push_back(
|
rOutProperties.push_back(
|
||||||
|
@@ -31,7 +31,7 @@ namespace comphelper
|
|||||||
|
|
||||||
namespace
|
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?
|
// 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
|
// Would be nice to have localized exception strings (a simply resource file containing
|
||||||
|
@@ -38,7 +38,7 @@ namespace frm
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
static URL createClipboardURL( OClipboardDispatcher::ClipboardFunc _eFunc )
|
URL createClipboardURL( OClipboardDispatcher::ClipboardFunc _eFunc )
|
||||||
{
|
{
|
||||||
URL aURL;
|
URL aURL;
|
||||||
switch ( _eFunc )
|
switch ( _eFunc )
|
||||||
|
@@ -53,7 +53,7 @@ namespace frm
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
static SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId )
|
SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId )
|
||||||
{
|
{
|
||||||
switch ( _nSlotId )
|
switch ( _nSlotId )
|
||||||
{
|
{
|
||||||
|
@@ -543,7 +543,7 @@ namespace frm
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
static void lcl_inflate( Rectangle& _rRect, long _nInflateX, long _nInflateY )
|
void lcl_inflate( Rectangle& _rRect, long _nInflateX, long _nInflateY )
|
||||||
{
|
{
|
||||||
_rRect.Left() -= _nInflateX;
|
_rRect.Left() -= _nInflateX;
|
||||||
_rRect.Right() += _nInflateX;
|
_rRect.Right() += _nInflateX;
|
||||||
|
@@ -33,7 +33,7 @@ namespace framework
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
static sal_uInt16 impl_convertItemBitsToItemStyle( sal_Int16 nItemBits )
|
sal_uInt16 impl_convertItemBitsToItemStyle( sal_Int16 nItemBits )
|
||||||
{
|
{
|
||||||
sal_uInt16 nStyle( 0 );
|
sal_uInt16 nStyle( 0 );
|
||||||
|
|
||||||
|
@@ -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() )
|
if ( aContextList.isEmpty() )
|
||||||
return true;
|
return true;
|
||||||
|
@@ -20,7 +20,7 @@
|
|||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
//Find ascii escaped unicode
|
//Find ascii escaped unicode
|
||||||
static sal_Int32 lcl_IndexOfUnicode(
|
sal_Int32 lcl_IndexOfUnicode(
|
||||||
const OString& rSource, const sal_Int32 nFrom = 0 )
|
const OString& rSource, const sal_Int32 nFrom = 0 )
|
||||||
{
|
{
|
||||||
const OString sHexDigits = "0123456789abcdefABCDEF";
|
const OString sHexDigits = "0123456789abcdefABCDEF";
|
||||||
@@ -41,7 +41,7 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Convert ascii escaped unicode to utf-8
|
//Convert ascii escaped unicode to utf-8
|
||||||
static OString lcl_ConvertToUTF8( const OString& rText )
|
OString lcl_ConvertToUTF8( const OString& rText )
|
||||||
{
|
{
|
||||||
OString sResult = rText;
|
OString sResult = rText;
|
||||||
sal_Int32 nIndex = lcl_IndexOfUnicode( sResult );
|
sal_Int32 nIndex = lcl_IndexOfUnicode( sResult );
|
||||||
@@ -59,7 +59,7 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Escape unicode characters
|
//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 =
|
const OUString sTemp =
|
||||||
OStringToOUString( rText, RTL_TEXTENCODING_UTF8 );
|
OStringToOUString( rText, RTL_TEXTENCODING_UTF8 );
|
||||||
|
@@ -64,13 +64,13 @@ namespace
|
|||||||
SwCursorSaveState m_aSaveState;
|
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)
|
const IDocumentMarkAccess::pMark_t& rpSecond)
|
||||||
{
|
{
|
||||||
return rpFirst->GetMarkEnd() > rpSecond->GetMarkEnd();
|
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;
|
return IDocumentMarkAccess::GetType(*pMark) != IDocumentMarkAccess::MarkType::BOOKMARK;
|
||||||
}
|
}
|
||||||
|
@@ -22,13 +22,13 @@ namespace
|
|||||||
{
|
{
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
#include <intrin.h>
|
#include <intrin.h>
|
||||||
static void getCpuId(uint32_t array[4])
|
void getCpuId(uint32_t array[4])
|
||||||
{
|
{
|
||||||
__cpuid((int*)array, 1);
|
__cpuid((int*)array, 1);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#include <cpuid.h>
|
#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);
|
__get_cpuid(1, array + 0, array + 1, array + 2, array + 3);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user