This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new d6af8f9e10 Cleanup
d6af8f9e10 is described below
commit d6af8f9e10003c07768fbd3f77570ede3f562d2c
Author: mseidel <[email protected]>
AuthorDate: Tue Feb 17 11:16:19 2026 +0100
Cleanup
---
main/jvmfwk/source/fwkutil.cxx | 457 ++++----
main/svtools/source/dialogs/addresstemplate.src | 106 +-
main/svtools/source/dialogs/prnsetup.src | 88 +-
main/svtools/source/dialogs/wizardmachine.src | 2 -
main/svtools/source/misc/ehdl.src | 2 -
main/svtools/source/misc/helpagent.src | 2 -
main/svtools/source/misc/helpagentwindow.cxx | 5 +-
main/svtools/source/misc/undo.src | 2 -
main/svtools/source/toolpanel/toolpanel.src | 14 +-
main/vcl/source/app/settings.cxx | 1377 +++++++++++------------
10 files changed, 1021 insertions(+), 1034 deletions(-)
diff --git a/main/jvmfwk/source/fwkutil.cxx b/main/jvmfwk/source/fwkutil.cxx
index 5d8a90dfd2..e692d783bd 100644
--- a/main/jvmfwk/source/fwkutil.cxx
+++ b/main/jvmfwk/source/fwkutil.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_jvmfwk.hxx"
@@ -61,290 +59,291 @@ namespace jfw
bool isAccessibilitySupportDesired()
{
- OUString sValue;
- if ((sal_True == ::rtl::Bootstrap::get(
-
OUString(RTL_CONSTASCII_USTRINGPARAM("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY")),
sValue))
- && sValue.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("1")))
- )
- return false;
+ OUString sValue;
+ if ((sal_True == ::rtl::Bootstrap::get(
+
OUString(RTL_CONSTASCII_USTRINGPARAM("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY")),
sValue))
+ && sValue.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("1")))
+ )
+ return false;
- bool retVal = false;
+ bool retVal = false;
#ifdef WNT
- HKEY hKey = 0;
- if (RegOpenKeyEx(HKEY_CURRENT_USER,
- "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
- 0, KEY_READ, &hKey) == ERROR_SUCCESS)
- {
- DWORD dwType = 0;
- DWORD dwLen = 16;
- unsigned char arData[16];
- if( RegQueryValueEx(hKey, "SupportAssistiveTechnology", NULL, &dwType,
arData,
- & dwLen)== ERROR_SUCCESS)
- {
- if (dwType == REG_SZ)
- {
- if (strcmp((char*) arData, "true") == 0
- || strcmp((char*) arData, "1") == 0)
- retVal = true;
- else if (strcmp((char*) arData, "false") == 0
- || strcmp((char*) arData, "0") == 0)
- retVal = false;
+ HKEY hKey = 0;
+ if (RegOpenKeyEx(HKEY_CURRENT_USER,
+
"Software\\OpenOffice\\Accessibility\\AtToolSupport",
+ 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+ {
+ DWORD dwType = 0;
+ DWORD dwLen = 16;
+ unsigned char arData[16];
+ if( RegQueryValueEx(hKey, "SupportAssistiveTechnology", NULL,
&dwType, arData,
+ & dwLen)==
ERROR_SUCCESS)
+ {
+ if (dwType == REG_SZ)
+ {
+ if (strcmp((char*) arData, "true") == 0
+ || strcmp((char*) arData, "1") == 0)
+ retVal = true;
+ else if (strcmp((char*) arData, "false") == 0
+ || strcmp((char*) arData, "0")
== 0)
+ retVal = false;
#if OSL_DEBUG_LEVEL > 1
- else
- OSL_ASSERT(0);
+ else
+ OSL_ASSERT(0);
#endif
- }
- else if (dwType == REG_DWORD)
- {
- if (arData[0] == 1)
- retVal = true;
- else if (arData[0] == 0)
- retVal = false;
+ }
+ else if (dwType == REG_DWORD)
+ {
+ if (arData[0] == 1)
+ retVal = true;
+ else if (arData[0] == 0)
+ retVal = false;
#if OSL_DEBUG_LEVEL > 1
- else
- OSL_ASSERT(0);
+ else
+ OSL_ASSERT(0);
#endif
- }
- }
- }
- RegCloseKey(hKey);
+ }
+ }
+ }
+ RegCloseKey(hKey);
#elif UNX
- char buf[16];
- // use 2 shells to suppress the eventual "gcontool-2 not found" message
- // of the shell trying to execute the command
- FILE* fp = popen( "/bin/sh 2>/dev/null -c \"gconftool-2 -g
/desktop/gnome/interface/accessibility\"", "r" );
- if( fp )
- {
- if( fgets( buf, sizeof(buf), fp ) )
- {
- int nCompare = strncasecmp( buf, "true", 4 );
- retVal = (nCompare == 0 ? true : false);
- }
- pclose( fp );
- }
+ char buf[16];
+ // use 2 shells to suppress the eventual "gcontool-2 not found" message
+ // of the shell trying to execute the command
+ FILE* fp = popen( "/bin/sh 2>/dev/null -c \"gconftool-2 -g
/desktop/gnome/interface/accessibility\"", "r" );
+ if( fp )
+ {
+ if( fgets( buf, sizeof(buf), fp ) )
+ {
+ int nCompare = strncasecmp( buf, "true", 4 );
+ retVal = (nCompare == 0 ? true : false);
+ }
+ pclose( fp );
+ }
#endif
- return retVal;
+ return retVal;
}
-
rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData)
{
- static char EncodingTable[] =
- {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
- sal_Int32 lenRaw = rawData.getLength();
- char* pBuf = new char[lenRaw * 2];
- const sal_Int8* arRaw = rawData.getConstArray();
+ static char EncodingTable[] =
+
{'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
+ sal_Int32 lenRaw = rawData.getLength();
+ char* pBuf = new char[lenRaw * 2];
+ const sal_Int8* arRaw = rawData.getConstArray();
- char* pCurBuf = pBuf;
- for (int i = 0; i < lenRaw; i++)
- {
- unsigned char curChar = arRaw[i];
- curChar >>= 4;
+ char* pCurBuf = pBuf;
+ for (int i = 0; i < lenRaw; i++)
+ {
+ unsigned char curChar = arRaw[i];
+ curChar >>= 4;
- *pCurBuf = EncodingTable[curChar];
- pCurBuf++;
+ *pCurBuf = EncodingTable[curChar];
+ pCurBuf++;
- curChar = arRaw[i];
- curChar &= 0x0F;
+ curChar = arRaw[i];
+ curChar &= 0x0F;
- *pCurBuf = EncodingTable[curChar];
- pCurBuf++;
- }
+ *pCurBuf = EncodingTable[curChar];
+ pCurBuf++;
+ }
- rtl::ByteSequence ret((sal_Int8*) pBuf, lenRaw * 2);
- delete [] pBuf;
- return ret;
+ rtl::ByteSequence ret((sal_Int8*) pBuf, lenRaw * 2);
+ delete [] pBuf;
+ return ret;
}
rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data)
{
- static char decodingTable[] =
- {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
- sal_Int32 lenData = data.getLength();
- sal_Int32 lenBuf = lenData / 2; //always divisable by two
- unsigned char* pBuf = new unsigned char[lenBuf];
- const sal_Int8* pData = data.getConstArray();
- for (sal_Int32 i = 0; i < lenBuf; i++)
- {
- sal_Int8 curChar = *pData++;
- //find the index of the first 4bits
+ static char decodingTable[] =
+
{'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
+ sal_Int32 lenData = data.getLength();
+ sal_Int32 lenBuf = lenData / 2; // always dividable by two
+ unsigned char* pBuf = new unsigned char[lenBuf];
+ const sal_Int8* pData = data.getConstArray();
+ for (sal_Int32 i = 0; i < lenBuf; i++)
+ {
+ sal_Int8 curChar = *pData++;
+ // find the index of the first 4bits
// TODO What happens if text is not valid Hex characters?
- unsigned char nibble = 0;
- for (unsigned char j = 0; j < 16; j++)
- {
- if (curChar == decodingTable[j])
- {
- nibble = j;
- break;
- }
- }
- nibble <<= 4;
- curChar = *pData++;
- //find the index for the next 4bits
- for (unsigned char j = 0; j < 16; j++)
- {
- if (curChar == decodingTable[j])
- {
- nibble |= j;
- break;
- }
- }
- pBuf[i] = nibble;
- }
- rtl::ByteSequence ret((sal_Int8*) pBuf, lenBuf );
- delete [] pBuf;
- return ret;
+ unsigned char nibble = 0;
+ for (unsigned char j = 0; j < 16; j++)
+ {
+ if (curChar == decodingTable[j])
+ {
+ nibble = j;
+ break;
+ }
+ }
+ nibble <<= 4;
+ curChar = *pData++;
+ // find the index for the next 4bits
+ for (unsigned char j = 0; j < 16; j++)
+ {
+ if (curChar == decodingTable[j])
+ {
+ nibble |= j;
+ break;
+ }
+ }
+ pBuf[i] = nibble;
+ }
+ rtl::ByteSequence ret((sal_Int8*) pBuf, lenBuf );
+ delete [] pBuf;
+ return ret;
}
rtl::OUString getDirFromFile(const rtl::OUString& usFilePath)
{
- sal_Int32 index= usFilePath.lastIndexOf('/');
- return rtl::OUString(usFilePath.getStr(), index);
+ sal_Int32 index= usFilePath.lastIndexOf('/');
+ return rtl::OUString(usFilePath.getStr(), index);
}
rtl::OUString getExecutableDirectory()
{
- rtl_uString* sExe = NULL;
- if (osl_getExecutableFile( & sExe) != osl_Process_E_None)
- throw FrameworkException(
- JFW_E_ERROR,
- "[Java framework] Error in function getExecutableDirectory
(fwkutil.cxx)");
+ rtl_uString* sExe = NULL;
+ if (osl_getExecutableFile( & sExe) != osl_Process_E_None)
+ throw FrameworkException(
+ JFW_E_ERROR,
+ "[Java framework] Error in function
getExecutableDirectory (fwkutil.cxx)");
- rtl::OUString ouExe(sExe, SAL_NO_ACQUIRE);
- return getDirFromFile(ouExe);
+ rtl::OUString ouExe(sExe, SAL_NO_ACQUIRE);
+ return getDirFromFile(ouExe);
}
rtl::OUString findPlugin(
- const rtl::OUString & baseUrl, const rtl::OUString & plugin)
+ const rtl::OUString & baseUrl, const rtl::OUString & plugin)
{
- rtl::OUString expandedPlugin;
- try
- {
- expandedPlugin = cppu::bootstrap_expandUri(plugin);
- }
- catch (com::sun::star::lang::IllegalArgumentException & e)
- {
- throw FrameworkException(
- JFW_E_ERROR,
- (rtl::OString(
- RTL_CONSTASCII_STRINGPARAM(
- "[Java framework] IllegalArgumentException in"
- " findPlugin: "))
- + rtl::OUStringToOString(e.Message,
osl_getThreadTextEncoding())));
- }
- rtl::OUString sUrl;
- try
- {
- sUrl = rtl::Uri::convertRelToAbs(baseUrl, expandedPlugin);
- }
- catch (rtl::MalformedUriException & e)
- {
- throw FrameworkException(
- JFW_E_ERROR,
- (rtl::OString(
- RTL_CONSTASCII_STRINGPARAM(
- "[Java framework] rtl::MalformedUriException in"
- " findPlugin: "))
- + rtl::OUStringToOString(
- e.getMessage(), osl_getThreadTextEncoding())));
- }
- if (checkFileURL(sUrl) == jfw::FILE_OK)
- {
- return sUrl;
- }
- rtl::OUString retVal;
- rtl::OUString sProgDir = getExecutableDirectory();
- sUrl = sProgDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
- + plugin;
- jfw::FileStatus s = checkFileURL(sUrl);
- if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
- {
- //If only the name of the library is given, then
- //use PATH, LD_LIBRARY_PATH etc. to locate the plugin
- if (plugin.indexOf('/') == -1)
- {
- rtl::OUString url;
+ rtl::OUString expandedPlugin;
+ try
+ {
+ expandedPlugin = cppu::bootstrap_expandUri(plugin);
+ }
+ catch (com::sun::star::lang::IllegalArgumentException & e)
+ {
+ throw FrameworkException(
+ JFW_E_ERROR,
+ (rtl::OString(
+ RTL_CONSTASCII_STRINGPARAM(
+ "[Java framework]
IllegalArgumentException in"
+ " findPlugin: "))
+ + rtl::OUStringToOString(e.Message,
osl_getThreadTextEncoding())));
+ }
+ rtl::OUString sUrl;
+ try
+ {
+ sUrl = rtl::Uri::convertRelToAbs(baseUrl, expandedPlugin);
+ }
+ catch (rtl::MalformedUriException & e)
+ {
+ throw FrameworkException(
+ JFW_E_ERROR,
+ (rtl::OString(
+ RTL_CONSTASCII_STRINGPARAM(
+ "[Java framework]
rtl::MalformedUriException in"
+ " findPlugin: "))
+ + rtl::OUStringToOString(
+ e.getMessage(), osl_getThreadTextEncoding())));
+ }
+ if (checkFileURL(sUrl) == jfw::FILE_OK)
+ {
+ return sUrl;
+ }
+ rtl::OUString retVal;
+ rtl::OUString sProgDir = getExecutableDirectory();
+ sUrl = sProgDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
+ + plugin;
+ jfw::FileStatus s = checkFileURL(sUrl);
+ if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
+ {
+ // If only the name of the library is given, then
+ // use PATH, LD_LIBRARY_PATH etc. to locate the plugin
+ if (plugin.indexOf('/') == -1)
+ {
+ rtl::OUString url;
#ifdef UNX
#ifdef MACOSX
- rtl::OUString path =
rtl::OUString::createFromAscii("DYLD_LIBRARY_PATH");
+ rtl::OUString path =
rtl::OUString::createFromAscii("DYLD_LIBRARY_PATH");
#else
- rtl::OUString path =
rtl::OUString::createFromAscii("LD_LIBRARY_PATH");
+ rtl::OUString path =
rtl::OUString::createFromAscii("LD_LIBRARY_PATH");
#endif
- rtl::OUString env_path;
- oslProcessError err = osl_getEnvironment(path.pData,
&env_path.pData);
- if (err != osl_Process_E_None && err != osl_Process_E_NotFound)
- throw FrameworkException(
- JFW_E_ERROR,
- "[Java framework] Error in function findPlugin
(fwkutil.cxx).");
- if (err == osl_Process_E_NotFound)
- return retVal;
- if (osl_searchFileURL(plugin.pData, env_path.pData, &url.pData)
- == osl_File_E_None)
+ rtl::OUString env_path;
+ oslProcessError err = osl_getEnvironment(path.pData,
&env_path.pData);
+ if (err != osl_Process_E_None && err !=
osl_Process_E_NotFound)
+ throw FrameworkException(
+ JFW_E_ERROR,
+ "[Java framework] Error in function
findPlugin (fwkutil.cxx).");
+ if (err == osl_Process_E_NotFound)
+ return retVal;
+ if (osl_searchFileURL(plugin.pData, env_path.pData,
&url.pData)
+ ==
osl_File_E_None)
#else
- if (osl_searchFileURL(plugin.pData, NULL, &url.pData)
- == osl_File_E_None)
+ if (osl_searchFileURL(plugin.pData, NULL, &url.pData)
+ == osl_File_E_None)
#endif
- retVal = url;
- else
- throw FrameworkException(
- JFW_E_ERROR,
- "[Java framework] Error in function findPlugin
(fwkutil.cxx).");
- }
- }
+ retVal = url;
+ else
+ throw FrameworkException(
+ JFW_E_ERROR,
+ "[Java framework] Error in function
findPlugin (fwkutil.cxx).");
+ }
+ }
else
{
retVal = sUrl;
}
- return retVal;
+ return retVal;
}
rtl::OUString getLibraryLocation()
{
- rtl::OString sExcMsg("[Java framework] Error in function
getLibraryLocation "
- "(fwkutil.cxx).");
- rtl::OUString libraryFileUrl;
+ rtl::OString sExcMsg("[Java framework] Error in function
getLibraryLocation "
+ "(fwkutil.cxx).");
+ rtl::OUString libraryFileUrl;
- if (!osl::Module::getUrlFromAddress(
- reinterpret_cast< oslGenericFunction >(getLibraryLocation),
- libraryFileUrl))
- throw FrameworkException(JFW_E_ERROR, sExcMsg);
+ if (!osl::Module::getUrlFromAddress(
+ reinterpret_cast< oslGenericFunction
>(getLibraryLocation),
+ libraryFileUrl))
+ throw FrameworkException(JFW_E_ERROR, sExcMsg);
- return getDirFromFile(libraryFileUrl);
+ return getDirFromFile(libraryFileUrl);
}
jfw::FileStatus checkFileURL(const rtl::OUString & sURL)
{
- jfw::FileStatus ret = jfw::FILE_OK;
- DirectoryItem item;
- File::RC rc_item = DirectoryItem::get(sURL, item);
- if (File::E_None == rc_item)
- {
- osl::FileStatus status(FileStatusMask_Validate);
+ jfw::FileStatus ret = jfw::FILE_OK;
+ DirectoryItem item;
+ File::RC rc_item = DirectoryItem::get(sURL, item);
+ if (File::E_None == rc_item)
+ {
+ osl::FileStatus status(FileStatusMask_Validate);
- File::RC rc_stat = item.getFileStatus(status);
- if (File::E_None == rc_stat)
- {
- ret = FILE_OK;
- }
- else if (File::E_NOENT == rc_stat)
- {
- ret = FILE_DOES_NOT_EXIST;
- }
- else
- {
- ret = FILE_INVALID;
- }
- }
- else if (File::E_NOENT == rc_item)
- {
- ret = FILE_DOES_NOT_EXIST;
- }
- else
- {
- ret = FILE_INVALID;
- }
- return ret;
+ File::RC rc_stat = item.getFileStatus(status);
+ if (File::E_None == rc_stat)
+ {
+ ret = FILE_OK;
+ }
+ else if (File::E_NOENT == rc_stat)
+ {
+ ret = FILE_DOES_NOT_EXIST;
+ }
+ else
+ {
+ ret = FILE_INVALID;
+ }
+ }
+ else if (File::E_NOENT == rc_item)
+ {
+ ret = FILE_DOES_NOT_EXIST;
+ }
+ else
+ {
+ ret = FILE_INVALID;
+ }
+ return ret;
}
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svtools/source/dialogs/addresstemplate.src
b/main/svtools/source/dialogs/addresstemplate.src
index 58f7b3508f..0ef7934dae 100644
--- a/main/svtools/source/dialogs/addresstemplate.src
+++ b/main/svtools/source/dialogs/addresstemplate.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include <svtools/svtools.hrc>
#include "addresstemplate.hrc"
#include <svtools/controldims.hrc>
@@ -51,7 +49,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
Pos = MAP_APPFONT ( 12, 15 ) ;
Size = MAP_APPFONT ( 90, 10 ) ;
- Group = TRUE;
+ Group = TRUE ;
};
ComboBox CB_DATASOURCE
{
@@ -60,8 +58,8 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
Pos = MAP_APPFONT ( 105, 13 ) ;
Size = MAP_APPFONT ( 96, 55 ) ;
- DropDown = TRUE;
- TabStop = TRUE;
+ DropDown = TRUE ;
+ TabStop = TRUE ;
};
PushButton PB_ADMINISTATE_DATASOURCES
{
@@ -70,7 +68,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
SVLook = TRUE ;
Pos = MAP_APPFONT ( 204, 13 ) ;
Size = MAP_APPFONT ( 90, 14 ) ;
- TabStop = TRUE;
+ TabStop = TRUE ;
};
FixedText FT_TABLE
{
@@ -79,7 +77,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
Pos = MAP_APPFONT ( 12, 32 ) ;
Size = MAP_APPFONT ( 90, 10 ) ;
- Group = TRUE;
+ Group = TRUE ;
};
ComboBox CB_TABLE
{
@@ -95,7 +93,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
{
Text [ en-US ] = "Field assignment" ;
SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6, 30 + RSC_CD_DROPDOWN_HEIGHT +
RSC_SP_CTRL_Y ) ;
+ Pos = MAP_APPFONT ( 6, 30 + RSC_CD_DROPDOWN_HEIGHT +
RSC_SP_CTRL_Y ) ;
Size = MAP_APPFONT ( 248, RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
Window CT_BORDER
@@ -109,14 +107,14 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
FixedText FT_FIELD_BASE + row * 2 + column \
{ \
SVLook = TRUE ; \
- Pos = MAP_APPFONT ( 3 + column * 134,
RSC_SP_CTRL_GROUP_Y + 2 + row * FIELD_ROW_HEIGHT ) ; \
+ Pos = MAP_APPFONT ( 3 + column * 134,
RSC_SP_CTRL_GROUP_Y + 2 + row * FIELD_ROW_HEIGHT ) ; \
Size = MAP_APPFONT ( 79, 10 ) ; \
Group = TRUE ; \
}; \
ListBox LB_FIELD_BASE + row * 2 + column \
{ \
SVLook = TRUE ; \
- Pos = MAP_APPFONT ( 89 + column * 134,
RSC_SP_CTRL_GROUP_Y + row * FIELD_ROW_HEIGHT ) ; \
+ Pos = MAP_APPFONT ( 89 + column * 134,
RSC_SP_CTRL_GROUP_Y + row * FIELD_ROW_HEIGHT ) ; \
Size = MAP_APPFONT ( 42, 14 ) ; \
Border = TRUE ; \
DropDown = TRUE ; \
@@ -124,28 +122,28 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
}
#if FIELD_PAIRS_VISIBLE > 0
- DECLARE_FIELD( 0, 0 );
- DECLARE_FIELD( 0, 1 );
+ DECLARE_FIELD( 0, 0 ) ;
+ DECLARE_FIELD( 0, 1 ) ;
#endif
#if FIELD_PAIRS_VISIBLE > 1
- DECLARE_FIELD( 1, 0 );
- DECLARE_FIELD( 1, 1 );
+ DECLARE_FIELD( 1, 0 ) ;
+ DECLARE_FIELD( 1, 1 ) ;
#endif
#if FIELD_PAIRS_VISIBLE > 2
- DECLARE_FIELD( 3, 0 );
- DECLARE_FIELD( 3, 1 );
+ DECLARE_FIELD( 3, 0 ) ;
+ DECLARE_FIELD( 3, 1 ) ;
#endif
#if FIELD_PAIRS_VISIBLE > 3
- DECLARE_FIELD( 2, 0 );
- DECLARE_FIELD( 2, 1 );
+ DECLARE_FIELD( 2, 0 ) ;
+ DECLARE_FIELD( 2, 1 ) ;
#endif
#if FIELD_PAIRS_VISIBLE > 4
- DECLARE_FIELD( 4, 0 );
- DECLARE_FIELD( 4, 1 );
+ DECLARE_FIELD( 4, 0 ) ;
+ DECLARE_FIELD( 4, 1 ) ;
#endif
#if FIELD_PAIRS_VISIBLE > 5
- DECLARE_FIELD( 5, 0 );
- DECLARE_FIELD( 5, 1 );
+ DECLARE_FIELD( 5, 0 ) ;
+ DECLARE_FIELD( 5, 1 ) ;
#endif
ScrollBar SB_FIELDSCROLLER
@@ -188,133 +186,133 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
String STR_NO_FIELD_SELECTION
{
Text [ en-US ] = "<none>" ;
- };
+ };
String STR_FIELD_COMPANY
{
Text [ en-US ] = "Company" ;
- };
+ };
String STR_FIELD_DEPARTMENT
{
Text [ en-US ] = "Department" ;
- };
+ };
String STR_FIELD_FIRSTNAME
{
Text [ en-US ] = "First name" ;
- };
+ };
String STR_FIELD_LASTNAME
{
Text [ en-US ] = "Last name" ;
- };
+ };
String STR_FIELD_STREET
{
Text [ en-US ] = "Street" ;
- };
+ };
String STR_FIELD_COUNTRY
{
Text [ en-US ] = "Country" ;
- };
+ };
String STR_FIELD_ZIPCODE
{
Text [ en-US ] = "ZIP Code" ;
- };
+ };
String STR_FIELD_CITY
{
Text [ en-US ] = "City" ;
- };
+ };
String STR_FIELD_TITLE
{
Text [ en-US ] = "Title" ;
- };
+ };
String STR_FIELD_POSITION
{
Text [ en-US ] = "Position" ;
- };
+ };
String STR_FIELD_ADDRFORM
{
Text [ en-US ] = "Addr. Form" ;
- };
+ };
String STR_FIELD_INITIALS
{
Text [ en-US ] = "Initials" ;
- };
+ };
String STR_FIELD_SALUTATION
{
Text [ en-US ] = "Complimentary close" ;
- };
+ };
String STR_FIELD_HOMETEL
{
Text [ en-US ] = "Tel: Home" ;
- };
+ };
String STR_FIELD_WORKTEL
{
Text [ en-US ] = "Tel: Work" ;
- };
+ };
String STR_FIELD_FAX
{
Text [ en-US ] = "Fax" ;
- };
+ };
String STR_FIELD_EMAIL
{
Text [ en-US ] = "E-mail" ;
- };
+ };
String STR_FIELD_URL
{
Text [ en-US ] = "URL" ;
- };
+ };
String STR_FIELD_NOTE
{
Text [ en-US ] = "Note" ;
- };
+ };
String STR_FIELD_USER1
{
Text [ en-US ] = "User 1" ;
- };
+ };
String STR_FIELD_USER2
{
Text [ en-US ] = "User 2" ;
- };
+ };
String STR_FIELD_USER3
{
Text [ en-US ] = "User 3" ;
- };
+ };
String STR_FIELD_USER4
{
Text [ en-US ] = "User 4" ;
- };
+ };
String STR_FIELD_ID
{
Text [ en-US ] = "ID" ;
- };
+ };
String STR_FIELD_STATE
{
Text [ en-US ] = "State" ;
- };
+ };
String STR_FIELD_OFFICETEL
{
Text [ en-US ] = "Tel: Office" ;
- };
+ };
String STR_FIELD_PAGER
{
Text [ en-US ] = "Pager" ;
- };
+ };
String STR_FIELD_MOBILE
{
Text [ en-US ] = "Mobile" ;
- };
+ };
String STR_FIELD_TELOTHER
{
Text [ en-US ] = "Tel: Other" ;
- };
+ };
String STR_FIELD_CALENDAR
{
Text [ en-US ] = "Calendar" ;
- };
+ };
String STR_FIELD_INVITE
{
Text [ en-US ] = "Invite" ;
- };
+ };
};
// ********************************************************************** EOF
diff --git a/main/svtools/source/dialogs/prnsetup.src
b/main/svtools/source/dialogs/prnsetup.src
index 9d1cd0c3e9..ab7fc1394a 100644
--- a/main/svtools/source/dialogs/prnsetup.src
+++ b/main/svtools/source/dialogs/prnsetup.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "prnsetup.hrc"
String STR_SVT_PRNDLG_READY
@@ -134,110 +132,112 @@ String STR_SVT_PRNDLG_JOBCOUNT
ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
{
- HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG";
+ HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG" ;
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
- Size = MAP_APPFONT ( 260 , 104 ) ;
+ Size = MAP_APPFONT ( 260, 104 ) ;
Text [ en-US ] = "Printer Setup" ;
FixedLine FL_PRINTER
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 248, 8 ) ;
Text [ en-US ] = "Printer" ;
};
FixedText FT_NAME
{
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 14 ) ;
+ Size = MAP_APPFONT ( 45, 10 ) ;
Text [ en-US ] = "~Name" ;
};
ListBox LB_NAMES
{
- HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES";
+ HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 60 , 12 ) ;
- Size = MAP_APPFONT ( 125 , 80 ) ;
+ Pos = MAP_APPFONT ( 60, 12 ) ;
+ Size = MAP_APPFONT ( 125, 80 ) ;
DropDown = TRUE ;
Sort = TRUE ;
};
PushButton BTN_PROPERTIES
{
- HelpID =
"svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES";
- Pos = MAP_APPFONT ( 188 , 12 ) ;
- Size = MAP_APPFONT ( 60 , 14 ) ;
+ HelpID =
"svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES" ;
+ Pos = MAP_APPFONT ( 188, 12 ) ;
+ Size = MAP_APPFONT ( 60, 14 ) ;
Text [ en-US ] = "Propert~ies..." ;
};
FixedText FT_STATUS
{
- Pos = MAP_APPFONT ( 12 , 29 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 29 ) ;
+ Size = MAP_APPFONT ( 45, 10 ) ;
Text [ en-US ] = "Status" ;
};
FixedText FI_STATUS
{
- Pos = MAP_APPFONT ( 60 , 29 ) ;
- Size = MAP_APPFONT ( 188 , 10 ) ;
+ Pos = MAP_APPFONT ( 60, 29 ) ;
+ Size = MAP_APPFONT ( 188, 10 ) ;
};
FixedText FT_TYPE
{
- Pos = MAP_APPFONT ( 12 , 40 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 40 ) ;
+ Size = MAP_APPFONT ( 45, 10 ) ;
Text [ en-US ] = "Type" ;
};
FixedText FI_TYPE
{
- Pos = MAP_APPFONT ( 60 , 40 ) ;
- Size = MAP_APPFONT ( 188 , 10 ) ;
+ Pos = MAP_APPFONT ( 60, 40 ) ;
+ Size = MAP_APPFONT ( 188, 10 ) ;
};
FixedText FT_LOCATION
{
- Pos = MAP_APPFONT ( 12 , 51 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 51 ) ;
+ Size = MAP_APPFONT ( 45, 10 ) ;
Text [ en-US ] = "Location" ;
};
FixedText FI_LOCATION
{
- Pos = MAP_APPFONT ( 60 , 51 ) ;
- Size = MAP_APPFONT ( 188 , 10 ) ;
+ Pos = MAP_APPFONT ( 60, 51 ) ;
+ Size = MAP_APPFONT ( 188, 10 ) ;
};
FixedText FT_COMMENT
{
- Pos = MAP_APPFONT ( 12 , 62 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 62 ) ;
+ Size = MAP_APPFONT ( 45, 10 ) ;
Text [ en-US ] = "Comment" ;
};
FixedText FI_COMMENT
{
- Pos = MAP_APPFONT ( 60 , 62 ) ;
- Size = MAP_APPFONT ( 188 , 10 ) ;
+ Pos = MAP_APPFONT ( 60, 62 ) ;
+ Size = MAP_APPFONT ( 188, 10 ) ;
+ };
+ FixedLine FL_SEPBUTTON
+ {
+ Pos = MAP_APPFONT ( 0, 78 ) ;
+ Size = MAP_APPFONT ( 260, 2 ) ;
};
- FixedLine FL_SEPBUTTON
- {
- Pos = MAP_APPFONT ( 0, 78 );
- Size = MAP_APPFONT ( 260, 2 );
- };
PushButton BTN_OPTIONS
{
- HelpID =
"svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_OPTIONS";
- Pos = MAP_APPFONT ( 5 , 84 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ HelpID =
"svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_OPTIONS" ;
+ Pos = MAP_APPFONT ( 5, 84 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Options..." ;
};
OKButton BTN_OK
{
- Pos = MAP_APPFONT ( 95 , 84 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 95, 84 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
- Pos = MAP_APPFONT ( 148 , 84 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 148, 84 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
};
HelpButton BTN_HELP
{
- Pos = MAP_APPFONT ( 204 , 84 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 204, 84 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
};
};
+
+// ********************************************************************** EOF
diff --git a/main/svtools/source/dialogs/wizardmachine.src
b/main/svtools/source/dialogs/wizardmachine.src
index 3f1125fedd..1a91e8e67e 100644
--- a/main/svtools/source/dialogs/wizardmachine.src
+++ b/main/svtools/source/dialogs/wizardmachine.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _SVTOOLS_HRC
#include <svtools/svtools.hrc>
#endif
diff --git a/main/svtools/source/misc/ehdl.src
b/main/svtools/source/misc/ehdl.src
index 90db96be45..7c2dc579be 100644
--- a/main/svtools/source/misc/ehdl.src
+++ b/main/svtools/source/misc/ehdl.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#define __RSC
#include <svtools/svtools.hrc>
#include <svtools/sfxecode.hxx>
diff --git a/main/svtools/source/misc/helpagent.src
b/main/svtools/source/misc/helpagent.src
index a96af3d8bd..0fce259a8b 100644
--- a/main/svtools/source/misc/helpagent.src
+++ b/main/svtools/source/misc/helpagent.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _SVTOOLS_HRC
#include <svtools/svtools.hrc>
#endif
diff --git a/main/svtools/source/misc/helpagentwindow.cxx
b/main/svtools/source/misc/helpagentwindow.cxx
index e60911dd2e..f525c0430f 100644
--- a/main/svtools/source/misc/helpagentwindow.cxx
+++ b/main/svtools/source/misc/helpagentwindow.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
#include <svtools/helpagentwindow.hxx>
@@ -177,4 +175,5 @@ namespace svt
//........................................................................
} // namespace svt
-//........................................................................
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svtools/source/misc/undo.src
b/main/svtools/source/misc/undo.src
index ca95c5674c..a137467f5b 100644
--- a/main/svtools/source/misc/undo.src
+++ b/main/svtools/source/misc/undo.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// include ------------------------------------------------------------------
#include <svtools/svtools.hrc>
diff --git a/main/svtools/source/toolpanel/toolpanel.src
b/main/svtools/source/toolpanel/toolpanel.src
index 7654a0ace0..5027e3aba3 100644
--- a/main/svtools/source/toolpanel/toolpanel.src
+++ b/main/svtools/source/toolpanel/toolpanel.src
@@ -19,36 +19,36 @@
*
*************************************************************/
-
-
#include "svtools/svtools.hrc"
String STR_SVT_TOOL_PANEL_BUTTON_FWD
{
- Text [ en-US ] = "Tab Panel Scroll Button, backward";
+ Text [ en-US ] = "Tab Panel Scroll Button, backward";
};
String STR_SVT_TOOL_PANEL_BUTTON_BACK
{
- Text [ en-US ] = "Tab Panel Scroll Button, forward";
+ Text [ en-US ] = "Tab Panel Scroll Button, forward";
};
Image IMG_TRIANGLE_RIGHT
{
- ImageBitmap = Bitmap { File = "triangle_right.png"; };
+ ImageBitmap = Bitmap { File = "triangle_right.png"; };
};
Image IMG_TRIANGLE_RIGHT_HC
{
- ImageBitmap = Bitmap { File = "triangle_right_hc.png"; };
+ ImageBitmap = Bitmap { File = "triangle_right_hc.png"; };
};
Image IMG_TRIANGLE_DOWN
{
- ImageBitmap = Bitmap { File = "triangle_down.png"; };
+ ImageBitmap = Bitmap { File = "triangle_down.png"; };
};
Image IMG_TRIANGLE_DOWN_HC
{
ImageBitmap = Bitmap { File = "plus.png"; } ;
};
+
+// ********************************************************************** EOF
diff --git a/main/vcl/source/app/settings.cxx b/main/vcl/source/app/settings.cxx
index 7dd675dd47..a6b3021bf9 100644
--- a/main/vcl/source/app/settings.cxx
+++ b/main/vcl/source/app/settings.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
@@ -62,102 +60,102 @@ DBG_NAME( AllSettings )
// =======================================================================
-#define STDSYS_STYLE (STYLE_OPTION_SCROLLARROW | \
- STYLE_OPTION_SPINARROW | \
- STYLE_OPTION_SPINUPDOWN | \
- STYLE_OPTION_NOMNEMONICS)
+#define STDSYS_STYLE (STYLE_OPTION_SCROLLARROW |
\
+
STYLE_OPTION_SPINARROW | \
+
STYLE_OPTION_SPINUPDOWN | \
+
STYLE_OPTION_NOMNEMONICS)
// =======================================================================
ImplMachineData::ImplMachineData()
{
- mnRefCount = 1;
- mnOptions = 0;
- mnScreenOptions = 0;
- mnPrintOptions = 0;
- mnScreenRasterFontDeviation = 0;
+ mnRefCount = 1;
+ mnOptions = 0;
+ mnScreenOptions = 0;
+ mnPrintOptions = 0;
+ mnScreenRasterFontDeviation = 0;
}
// -----------------------------------------------------------------------
ImplMachineData::ImplMachineData( const ImplMachineData& rData )
{
- mnRefCount = 1;
- mnOptions = rData.mnOptions;
- mnScreenOptions = rData.mnScreenOptions;
- mnPrintOptions = rData.mnPrintOptions;
- mnScreenRasterFontDeviation = rData.mnScreenRasterFontDeviation;
+ mnRefCount = 1;
+ mnOptions = rData.mnOptions;
+ mnScreenOptions = rData.mnScreenOptions;
+ mnPrintOptions = rData.mnPrintOptions;
+ mnScreenRasterFontDeviation = rData.mnScreenRasterFontDeviation;
}
// -----------------------------------------------------------------------
MachineSettings::MachineSettings()
{
- mpData = new ImplMachineData();
+ mpData = new ImplMachineData();
}
// -----------------------------------------------------------------------
MachineSettings::MachineSettings( const MachineSettings& rSet )
{
- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MachineSettings:
RefCount overflow" );
+ DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MachineSettings:
RefCount overflow" );
- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
- mpData = rSet.mpData;
- mpData->mnRefCount++;
+ // shared Instance Daten übernehmen und Referenzcounter erhöhen
+ mpData = rSet.mpData;
+ mpData->mnRefCount++;
}
// -----------------------------------------------------------------------
MachineSettings::~MachineSettings()
{
- // Daten loeschen, wenn letzte Referenz
- if ( mpData->mnRefCount == 1 )
- delete mpData;
- else
- mpData->mnRefCount--;
+ // Daten löschen, wenn letzte Referenz
+ if ( mpData->mnRefCount == 1 )
+ delete mpData;
+ else
+ mpData->mnRefCount--;
}
// -----------------------------------------------------------------------
const MachineSettings& MachineSettings::operator =( const MachineSettings&
rSet )
{
- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MachineSettings:
RefCount overflow" );
+ DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MachineSettings:
RefCount overflow" );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
- rSet.mpData->mnRefCount++;
+ // Zuerst Referenzcounter erhöhen, damit man sich selbst zuweisen kann
+ rSet.mpData->mnRefCount++;
- // Daten loeschen, wenn letzte Referenz
- if ( mpData->mnRefCount == 1 )
- delete mpData;
- else
- mpData->mnRefCount--;
+ // Daten löschen, wenn letzte Referenz
+ if ( mpData->mnRefCount == 1 )
+ delete mpData;
+ else
+ mpData->mnRefCount--;
- mpData = rSet.mpData;
+ mpData = rSet.mpData;
- return *this;
+ return *this;
}
// -----------------------------------------------------------------------
void MachineSettings::CopyData()
{
- // Falls noch andere Referenzen bestehen, dann kopieren
- if ( mpData->mnRefCount != 1 )
- {
- mpData->mnRefCount--;
- mpData = new ImplMachineData( *mpData );
- }
+ // Falls noch andere Referenzen bestehen, dann kopieren
+ if ( mpData->mnRefCount != 1 )
+ {
+ mpData->mnRefCount--;
+ mpData = new ImplMachineData( *mpData );
+ }
}
// -----------------------------------------------------------------------
sal_Bool MachineSettings::operator ==( const MachineSettings& rSet ) const
{
- if ( mpData == rSet.mpData )
- return sal_True;
+ if ( mpData == rSet.mpData )
+ return sal_True;
- if ( (mpData->mnOptions == rSet.mpData->mnOptions)
&&
- (mpData->mnScreenOptions ==
rSet.mpData->mnScreenOptions) &&
+ if ( (mpData->mnOptions == rSet.mpData->mnOptions)
&&
+ (mpData->mnScreenOptions ==
rSet.mpData->mnScreenOptions) &&
(mpData->mnPrintOptions ==
rSet.mpData->mnPrintOptions) &&
(mpData->mnScreenRasterFontDeviation ==
rSet.mpData->mnScreenRasterFontDeviation) )
return sal_True;
@@ -169,28 +167,28 @@ sal_Bool MachineSettings::operator ==( const
MachineSettings& rSet ) const
ImplMouseData::ImplMouseData()
{
- mnRefCount = 1;
- mnOptions = 0;
- mnDoubleClkTime = 500;
- mnDoubleClkWidth = 2;
- mnDoubleClkHeight = 2;
- mnStartDragWidth = 2;
- mnStartDragHeight = 2;
- mnStartDragCode = MOUSE_LEFT;
- mnDragMoveCode = 0;
- mnDragCopyCode = KEY_MOD1;
- mnDragLinkCode = KEY_SHIFT | KEY_MOD1;
- mnContextMenuCode = MOUSE_RIGHT;
- mnContextMenuClicks = 1;
- mbContextMenuDown = sal_True;
- mnMiddleButtonAction = MOUSE_MIDDLE_AUTOSCROLL;
- mnScrollRepeat = 100;
- mnButtonStartRepeat = 370;
- mnButtonRepeat = 90;
- mnActionDelay = 250;
- mnMenuDelay = 150;
- mnFollow = MOUSE_FOLLOW_MENU | MOUSE_FOLLOW_DDLIST;
- mnWheelBehavior = MOUSE_WHEEL_ALWAYS;
+ mnRefCount = 1;
+ mnOptions = 0;
+ mnDoubleClkTime = 500;
+ mnDoubleClkWidth = 2;
+ mnDoubleClkHeight = 2;
+ mnStartDragWidth = 2;
+ mnStartDragHeight = 2;
+ mnStartDragCode = MOUSE_LEFT;
+ mnDragMoveCode = 0;
+ mnDragCopyCode = KEY_MOD1;
+ mnDragLinkCode = KEY_SHIFT | KEY_MOD1;
+ mnContextMenuCode = MOUSE_RIGHT;
+ mnContextMenuClicks = 1;
+ mbContextMenuDown = sal_True;
+ mnMiddleButtonAction = MOUSE_MIDDLE_AUTOSCROLL;
+ mnScrollRepeat = 100;
+ mnButtonStartRepeat = 370;
+ mnButtonRepeat = 90;
+ mnActionDelay = 250;
+ mnMenuDelay = 150;
+ mnFollow = MOUSE_FOLLOW_MENU | MOUSE_FOLLOW_DDLIST;
+ mnWheelBehavior = MOUSE_WHEEL_ALWAYS;
}
// -----------------------------------------------------------------------
@@ -225,49 +223,49 @@ ImplMouseData::ImplMouseData( const ImplMouseData& rData )
MouseSettings::MouseSettings()
{
- mpData = new ImplMouseData();
+ mpData = new ImplMouseData();
}
// -----------------------------------------------------------------------
MouseSettings::MouseSettings( const MouseSettings& rSet )
{
- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MouseSettings: RefCount
overflow" );
+ DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MouseSettings:
RefCount overflow" );
- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
- mpData = rSet.mpData;
- mpData->mnRefCount++;
+ // shared Instance Daten übernehmen und Referenzcounter erhöhen
+ mpData = rSet.mpData;
+ mpData->mnRefCount++;
}
// -----------------------------------------------------------------------
MouseSettings::~MouseSettings()
{
- // Daten loeschen, wenn letzte Referenz
- if ( mpData->mnRefCount == 1 )
- delete mpData;
- else
- mpData->mnRefCount--;
+ // Daten löschen, wenn letzte Referenz
+ if ( mpData->mnRefCount == 1 )
+ delete mpData;
+ else
+ mpData->mnRefCount--;
}
// -----------------------------------------------------------------------
const MouseSettings& MouseSettings::operator =( const MouseSettings& rSet )
{
- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MouseSettings: RefCount
overflow" );
+ DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MouseSettings:
RefCount overflow" );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
- rSet.mpData->mnRefCount++;
+ // Zuerst Referenzcounter erhöhen, damit man sich selbst zuweisen kann
+ rSet.mpData->mnRefCount++;
- // Daten loeschen, wenn letzte Referenz
- if ( mpData->mnRefCount == 1 )
- delete mpData;
- else
- mpData->mnRefCount--;
+ // Daten löschen, wenn letzte Referenz
+ if ( mpData->mnRefCount == 1 )
+ delete mpData;
+ else
+ mpData->mnRefCount--;
- mpData = rSet.mpData;
+ mpData = rSet.mpData;
- return *this;
+ return *this;
}
// -----------------------------------------------------------------------
@@ -319,8 +317,8 @@ sal_Bool MouseSettings::operator ==( const MouseSettings&
rSet ) const
ImplKeyboardData::ImplKeyboardData()
{
- mnRefCount = 1;
- mnOptions = 0;
+ mnRefCount = 1;
+ mnOptions = 0;
}
// -----------------------------------------------------------------------
@@ -344,7 +342,7 @@ KeyboardSettings::KeyboardSettings( const KeyboardSettings&
rSet )
{
DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "KeyboardSettings:
RefCount overflow" );
- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
+ // shared Instance Daten übernehmen und Referenzcounter erhöhen
mpData = rSet.mpData;
mpData->mnRefCount++;
}
@@ -353,7 +351,7 @@ KeyboardSettings::KeyboardSettings( const KeyboardSettings&
rSet )
KeyboardSettings::~KeyboardSettings()
{
- // Daten loeschen, wenn letzte Referenz
+ // Daten löschen, wenn letzte Referenz
if ( mpData->mnRefCount == 1 )
delete mpData;
else
@@ -366,10 +364,10 @@ const KeyboardSettings& KeyboardSettings::operator =(
const KeyboardSettings& rS
{
DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "KeyboardSettings:
RefCount overflow" );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
+ // Zuerst Referenzcounter erhöhen, damit man sich selbst zuweisen kann
rSet.mpData->mnRefCount++;
- // Daten loeschen, wenn letzte Referenz
+ // Daten löschen, wenn letzte Referenz
if ( mpData->mnRefCount == 1 )
delete mpData;
else
@@ -449,121 +447,121 @@ ImplStyleData::ImplStyleData()
// -----------------------------------------------------------------------
ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
- maActiveBorderColor( rData.maActiveBorderColor ),
- maActiveColor( rData.maActiveColor ),
- maActiveColor2( rData.maActiveColor2 ),
- maActiveTextColor( rData.maActiveTextColor ),
- maButtonTextColor( rData.maButtonTextColor ),
- maButtonRolloverTextColor( rData.maButtonRolloverTextColor ),
- maCheckedColor( rData.maCheckedColor ),
- maDarkShadowColor( rData.maDarkShadowColor ),
- maDeactiveBorderColor( rData.maDeactiveBorderColor ),
- maDeactiveColor( rData.maDeactiveColor ),
- maDeactiveColor2( rData.maDeactiveColor2 ),
- maDeactiveTextColor( rData.maDeactiveTextColor ),
- maDialogColor( rData.maDialogColor ),
- maDialogTextColor( rData.maDialogTextColor ),
- maDisableColor( rData.maDisableColor ),
- maFaceColor( rData.maFaceColor ),
- maFieldColor( rData.maFieldColor ),
- maFieldTextColor( rData.maFieldTextColor ),
- maFieldRolloverTextColor( rData.maFieldRolloverTextColor ),
+ maActiveBorderColor( rData.maActiveBorderColor ),
+ maActiveColor( rData.maActiveColor ),
+ maActiveColor2( rData.maActiveColor2 ),
+ maActiveTextColor( rData.maActiveTextColor ),
+ maButtonTextColor( rData.maButtonTextColor ),
+ maButtonRolloverTextColor( rData.maButtonRolloverTextColor ),
+ maCheckedColor( rData.maCheckedColor ),
+ maDarkShadowColor( rData.maDarkShadowColor ),
+ maDeactiveBorderColor( rData.maDeactiveBorderColor ),
+ maDeactiveColor( rData.maDeactiveColor ),
+ maDeactiveColor2( rData.maDeactiveColor2 ),
+ maDeactiveTextColor( rData.maDeactiveTextColor ),
+ maDialogColor( rData.maDialogColor ),
+ maDialogTextColor( rData.maDialogTextColor ),
+ maDisableColor( rData.maDisableColor ),
+ maFaceColor( rData.maFaceColor ),
+ maFieldColor( rData.maFieldColor ),
+ maFieldTextColor( rData.maFieldTextColor ),
+ maFieldRolloverTextColor( rData.maFieldRolloverTextColor ),
maFontColor( rData.maFontColor ),
- maGroupTextColor( rData.maGroupTextColor ),
- maHelpColor( rData.maHelpColor ),
- maHelpTextColor( rData.maHelpTextColor ),
- maHighlightColor( rData.maHighlightColor ),
- maHighlightLinkColor( rData.maHighlightLinkColor ),
- maHighlightTextColor( rData.maHighlightTextColor ),
- maInfoTextColor( rData.maInfoTextColor ),
- maLabelTextColor( rData.maLabelTextColor ),
- maLightBorderColor( rData.maLightBorderColor ),
- maLightColor( rData.maLightColor ),
- maLinkColor( rData.maLinkColor ),
- maMenuBarColor( rData.maMenuBarColor ),
- maMenuBorderColor( rData.maMenuBorderColor ),
- maMenuColor( rData.maMenuColor ),
- maMenuHighlightColor( rData.maMenuHighlightColor ),
- maMenuHighlightTextColor( rData.maMenuHighlightTextColor ),
- maMenuTextColor( rData.maMenuTextColor ),
- maMenuBarTextColor( rData.maMenuBarTextColor ),
- maMonoColor( rData.maMonoColor ),
- maRadioCheckTextColor( rData.maRadioCheckTextColor ),
- maShadowColor( rData.maShadowColor ),
- maVisitedLinkColor( rData.maVisitedLinkColor ),
- maWindowColor( rData.maWindowColor ),
- maWindowTextColor( rData.maWindowTextColor ),
- maWorkspaceColor( rData.maWorkspaceColor ),
- maActiveTabColor( rData.maActiveTabColor ),
- maInactiveTabColor( rData.maInactiveTabColor ),
- maAppFont( rData.maAppFont ),
- maHelpFont( rData.maAppFont ),
- maTitleFont( rData.maTitleFont ),
- maFloatTitleFont( rData.maFloatTitleFont ),
- maMenuFont( rData.maMenuFont ),
- maToolFont( rData.maToolFont ),
- maLabelFont( rData.maLabelFont ),
- maInfoFont( rData.maInfoFont ),
- maRadioCheckFont( rData.maRadioCheckFont ),
- maPushButtonFont( rData.maPushButtonFont ),
- maFieldFont( rData.maFieldFont ),
- maIconFont( rData.maIconFont ),
- maGroupFont( rData.maGroupFont ),
- maWorkspaceGradient( rData.maWorkspaceGradient )
-{
- mnRefCount = 1;
- mnBorderSize = rData.mnBorderSize;
- mnTitleHeight = rData.mnTitleHeight;
- mnFloatTitleHeight = rData.mnFloatTitleHeight;
- mnTearOffTitleHeight = rData.mnTearOffTitleHeight;
- mnMenuBarHeight = rData.mnMenuBarHeight;
- mnScrollBarSize = rData.mnScrollBarSize;
- mnMinThumbSize = rData.mnMinThumbSize;
- mnSplitSize = rData.mnSplitSize;
- mnSpinSize = rData.mnSpinSize;
- mnIconHorzSpace = rData.mnIconHorzSpace;
- mnIconVertSpace = rData.mnIconVertSpace;
- mnAntialiasedMin = rData.mnAntialiasedMin;
- mnCursorSize = rData.mnCursorSize;
- mnCursorBlinkTime = rData.mnCursorBlinkTime;
- mnScreenZoom = rData.mnScreenZoom;
- mnScreenFontZoom = rData.mnScreenFontZoom;
- mnLogoDisplayTime = rData.mnLogoDisplayTime;
- mnDragFullOptions = rData.mnDragFullOptions;
- mnAnimationOptions = rData.mnAnimationOptions;
- mnSelectionOptions = rData.mnSelectionOptions;
- mnDisplayOptions = rData.mnDisplayOptions;
- mnOptions = rData.mnOptions;
+ maGroupTextColor( rData.maGroupTextColor ),
+ maHelpColor( rData.maHelpColor ),
+ maHelpTextColor( rData.maHelpTextColor ),
+ maHighlightColor( rData.maHighlightColor ),
+ maHighlightLinkColor( rData.maHighlightLinkColor ),
+ maHighlightTextColor( rData.maHighlightTextColor ),
+ maInfoTextColor( rData.maInfoTextColor ),
+ maLabelTextColor( rData.maLabelTextColor ),
+ maLightBorderColor( rData.maLightBorderColor ),
+ maLightColor( rData.maLightColor ),
+ maLinkColor( rData.maLinkColor ),
+ maMenuBarColor( rData.maMenuBarColor ),
+ maMenuBorderColor( rData.maMenuBorderColor ),
+ maMenuColor( rData.maMenuColor ),
+ maMenuHighlightColor( rData.maMenuHighlightColor ),
+ maMenuHighlightTextColor( rData.maMenuHighlightTextColor ),
+ maMenuTextColor( rData.maMenuTextColor ),
+ maMenuBarTextColor( rData.maMenuBarTextColor ),
+ maMonoColor( rData.maMonoColor ),
+ maRadioCheckTextColor( rData.maRadioCheckTextColor ),
+ maShadowColor( rData.maShadowColor ),
+ maVisitedLinkColor( rData.maVisitedLinkColor ),
+ maWindowColor( rData.maWindowColor ),
+ maWindowTextColor( rData.maWindowTextColor ),
+ maWorkspaceColor( rData.maWorkspaceColor ),
+ maActiveTabColor( rData.maActiveTabColor ),
+ maInactiveTabColor( rData.maInactiveTabColor ),
+ maAppFont( rData.maAppFont ),
+ maHelpFont( rData.maAppFont ),
+ maTitleFont( rData.maTitleFont ),
+ maFloatTitleFont( rData.maFloatTitleFont ),
+ maMenuFont( rData.maMenuFont ),
+ maToolFont( rData.maToolFont ),
+ maLabelFont( rData.maLabelFont ),
+ maInfoFont( rData.maInfoFont ),
+ maRadioCheckFont( rData.maRadioCheckFont ),
+ maPushButtonFont( rData.maPushButtonFont ),
+ maFieldFont( rData.maFieldFont ),
+ maIconFont( rData.maIconFont ),
+ maGroupFont( rData.maGroupFont ),
+ maWorkspaceGradient( rData.maWorkspaceGradient )
+{
+ mnRefCount = 1;
+ mnBorderSize = rData.mnBorderSize;
+ mnTitleHeight = rData.mnTitleHeight;
+ mnFloatTitleHeight = rData.mnFloatTitleHeight;
+ mnTearOffTitleHeight = rData.mnTearOffTitleHeight;
+ mnMenuBarHeight = rData.mnMenuBarHeight;
+ mnScrollBarSize = rData.mnScrollBarSize;
+ mnMinThumbSize = rData.mnMinThumbSize;
+ mnSplitSize = rData.mnSplitSize;
+ mnSpinSize = rData.mnSpinSize;
+ mnIconHorzSpace = rData.mnIconHorzSpace;
+ mnIconVertSpace = rData.mnIconVertSpace;
+ mnAntialiasedMin = rData.mnAntialiasedMin;
+ mnCursorSize = rData.mnCursorSize;
+ mnCursorBlinkTime = rData.mnCursorBlinkTime;
+ mnScreenZoom = rData.mnScreenZoom;
+ mnScreenFontZoom = rData.mnScreenFontZoom;
+ mnLogoDisplayTime = rData.mnLogoDisplayTime;
+ mnDragFullOptions = rData.mnDragFullOptions;
+ mnAnimationOptions = rData.mnAnimationOptions;
+ mnSelectionOptions = rData.mnSelectionOptions;
+ mnDisplayOptions = rData.mnDisplayOptions;
+ mnOptions = rData.mnOptions;
mnHighContrast = rData.mnHighContrast;
mnUseSystemUIFonts = rData.mnUseSystemUIFonts;
mnUseFlatBorders = rData.mnUseFlatBorders;
mnUseFlatMenues = rData.mnUseFlatMenues;
- mnAutoMnemonic = rData.mnAutoMnemonic;
- mnUseImagesInMenus = rData.mnUseImagesInMenus;
- mnSkipDisabledInMenus = rData.mnSkipDisabledInMenus;
- mnToolbarIconSize = rData.mnToolbarIconSize;
- mnSymbolsStyle = rData.mnSymbolsStyle;
- mnPreferredSymbolsStyle = rData.mnPreferredSymbolsStyle;
- mpFontOptions = rData.mpFontOptions;
- mnEdgeBlending = rData.mnEdgeBlending;
- maEdgeBlendingTopLeftColor = rData.maEdgeBlendingTopLeftColor;
- maEdgeBlendingBottomRightColor = rData.maEdgeBlendingBottomRightColor;
- mnListBoxMaximumLineCount = rData.mnListBoxMaximumLineCount;
- mnColorValueSetColumnCount = rData.mnColorValueSetColumnCount;
- mnColorValueSetMaximumRowCount = rData.mnColorValueSetMaximumRowCount;
- maListBoxPreviewDefaultLogicSize = rData.maListBoxPreviewDefaultLogicSize;
- maListBoxPreviewDefaultPixelSize = rData.maListBoxPreviewDefaultPixelSize;
- mnListBoxPreviewDefaultLineWidth = rData.mnListBoxPreviewDefaultLineWidth;
- mbPreviewUsesCheckeredBackground = rData.mbPreviewUsesCheckeredBackground;
+ mnAutoMnemonic = rData.mnAutoMnemonic;
+ mnUseImagesInMenus = rData.mnUseImagesInMenus;
+ mnSkipDisabledInMenus = rData.mnSkipDisabledInMenus;
+ mnToolbarIconSize = rData.mnToolbarIconSize;
+ mnSymbolsStyle = rData.mnSymbolsStyle;
+ mnPreferredSymbolsStyle = rData.mnPreferredSymbolsStyle;
+ mpFontOptions = rData.mpFontOptions;
+ mnEdgeBlending = rData.mnEdgeBlending;
+ maEdgeBlendingTopLeftColor = rData.maEdgeBlendingTopLeftColor;
+ maEdgeBlendingBottomRightColor = rData.maEdgeBlendingBottomRightColor;
+ mnListBoxMaximumLineCount = rData.mnListBoxMaximumLineCount;
+ mnColorValueSetColumnCount = rData.mnColorValueSetColumnCount;
+ mnColorValueSetMaximumRowCount = rData.mnColorValueSetMaximumRowCount;
+ maListBoxPreviewDefaultLogicSize =
rData.maListBoxPreviewDefaultLogicSize;
+ maListBoxPreviewDefaultPixelSize =
rData.maListBoxPreviewDefaultPixelSize;
+ mnListBoxPreviewDefaultLineWidth =
rData.mnListBoxPreviewDefaultLineWidth;
+ mbPreviewUsesCheckeredBackground =
rData.mbPreviewUsesCheckeredBackground;
}
// -----------------------------------------------------------------------
void ImplStyleData::SetStandardStyles()
{
- Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
- aStdFont.SetCharSet( gsl_getSystemTextEncoding() );
- aStdFont.SetWeight( WEIGHT_NORMAL );
+ Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
+ aStdFont.SetCharSet( gsl_getSystemTextEncoding() );
+ aStdFont.SetWeight( WEIGHT_NORMAL );
aStdFont.SetName(
utl::DefaultFontConfiguration::get()->getUserInterfaceFont(com::sun::star::lang::Locale(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(),
rtl::OUString() ) ) );
maAppFont = aStdFont;
maHelpFont = aStdFont;
@@ -619,20 +617,20 @@ void ImplStyleData::SetStandardStyles()
maHighlightColor = Color( COL_BLUE );
maHighlightTextColor = Color( COL_WHITE );
maActiveTabColor = Color( COL_WHITE );
- maInactiveTabColor = Color( COL_LIGHTGRAY );
- maDisableColor = Color( COL_GRAY );
- maHelpColor = Color( 0xFF, 0xFF, 0xE0 );
- maHelpTextColor = Color( COL_BLACK );
- maLinkColor = Color( COL_BLUE );
- maVisitedLinkColor = Color( 0x00, 0x00, 0xCC );
- maHighlightLinkColor = Color( COL_LIGHTBLUE );
+ maInactiveTabColor = Color( COL_LIGHTGRAY );
+ maDisableColor = Color( COL_GRAY );
+ maHelpColor = Color( 0xFF, 0xFF, 0xE0 );
+ maHelpTextColor = Color( COL_BLACK );
+ maLinkColor = Color( COL_BLUE );
+ maVisitedLinkColor = Color( 0x00, 0x00, 0xCC );
+ maHighlightLinkColor = Color( COL_LIGHTBLUE );
maFontColor = Color( COL_BLACK );
- mnBorderSize = 1;
- mnTitleHeight = 18;
- mnFloatTitleHeight = 13;
- mnTearOffTitleHeight = 8;
- mnMenuBarHeight = 14;
+ mnBorderSize = 1;
+ mnTitleHeight = 18;
+ mnFloatTitleHeight = 13;
+ mnTearOffTitleHeight = 8;
+ mnMenuBarHeight = 14;
mnHighContrast = 0;
mnUseSystemUIFonts = 1;
mnUseFlatBorders = 0;
@@ -640,79 +638,79 @@ void ImplStyleData::SetStandardStyles()
mnUseImagesInMenus = (sal_uInt16)sal_True;
mnSkipDisabledInMenus = (sal_uInt16)sal_False;
- Gradient aGrad( GRADIENT_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR,
DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
- maWorkspaceGradient = Wallpaper( aGrad );
+ Gradient aGrad( GRADIENT_LINEAR,
DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
+ maWorkspaceGradient = Wallpaper( aGrad );
}
// -----------------------------------------------------------------------
StyleSettings::StyleSettings()
{
- mpData = new ImplStyleData();
+ mpData = new ImplStyleData();
}
// -----------------------------------------------------------------------
StyleSettings::StyleSettings( const StyleSettings& rSet )
{
- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "StyleSettings: RefCount
overflow" );
+ DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "StyleSettings:
RefCount overflow" );
- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
- mpData = rSet.mpData;
- mpData->mnRefCount++;
+ // shared Instance Daten übernehmen und Referenzcounter erhöhen
+ mpData = rSet.mpData;
+ mpData->mnRefCount++;
}
// -----------------------------------------------------------------------
StyleSettings::~StyleSettings()
{
- // Daten loeschen, wenn letzte Referenz
- if ( mpData->mnRefCount == 1 )
- delete mpData;
- else
- mpData->mnRefCount--;
+ // Daten löschen, wenn letzte Referenz
+ if ( mpData->mnRefCount == 1 )
+ delete mpData;
+ else
+ mpData->mnRefCount--;
}
const Size& StyleSettings::GetListBoxPreviewDefaultPixelSize() const
{
- if(0 == mpData->maListBoxPreviewDefaultPixelSize.Width() || 0 ==
mpData->maListBoxPreviewDefaultPixelSize.Height())
- {
- const_cast< StyleSettings*
>(this)->mpData->maListBoxPreviewDefaultPixelSize =
-
Application::GetDefaultDevice()->LogicToPixel(mpData->maListBoxPreviewDefaultLogicSize,
MAP_APPFONT);
- }
+ if(0 == mpData->maListBoxPreviewDefaultPixelSize.Width() || 0 ==
mpData->maListBoxPreviewDefaultPixelSize.Height())
+ {
+ const_cast< StyleSettings*
>(this)->mpData->maListBoxPreviewDefaultPixelSize =
+
Application::GetDefaultDevice()->LogicToPixel(mpData->maListBoxPreviewDefaultLogicSize,
MAP_APPFONT);
+ }
- return mpData->maListBoxPreviewDefaultPixelSize;
+ return mpData->maListBoxPreviewDefaultPixelSize;
}
// -----------------------------------------------------------------------
void StyleSettings::Set3DColors( const Color& rColor )
{
- CopyData();
- mpData->maFaceColor = rColor;
- mpData->maLightBorderColor = rColor;
- mpData->maMenuBorderColor = rColor;
- mpData->maDarkShadowColor = Color( COL_BLACK );
- if ( rColor != Color( COL_LIGHTGRAY ) )
- {
- mpData->maLightColor = rColor;
- mpData->maShadowColor = rColor;
- mpData->maLightColor.IncreaseLuminance( 64 );
- mpData->maShadowColor.DecreaseLuminance( 64 );
- sal_uLong nRed = mpData->maLightColor.GetRed();
- sal_uLong nGreen = mpData->maLightColor.GetGreen();
- sal_uLong nBlue = mpData->maLightColor.GetBlue();
- nRed += (sal_uLong)(mpData->maShadowColor.GetRed());
- nGreen += (sal_uLong)(mpData->maShadowColor.GetGreen());
- nBlue += (sal_uLong)(mpData->maShadowColor.GetBlue());
- mpData->maCheckedColor = Color( (sal_uInt8)(nRed/2),
(sal_uInt8)(nGreen/2), (sal_uInt8)(nBlue/2) );
- }
- else
- {
- mpData->maCheckedColor = Color( 0x99, 0x99, 0x99 );
- mpData->maLightColor = Color( COL_WHITE );
- mpData->maShadowColor = Color( COL_GRAY );
- }
+ CopyData();
+ mpData->maFaceColor = rColor;
+ mpData->maLightBorderColor = rColor;
+ mpData->maMenuBorderColor = rColor;
+ mpData->maDarkShadowColor = Color( COL_BLACK );
+ if ( rColor != Color( COL_LIGHTGRAY ) )
+ {
+ mpData->maLightColor = rColor;
+ mpData->maShadowColor = rColor;
+ mpData->maLightColor.IncreaseLuminance( 64 );
+ mpData->maShadowColor.DecreaseLuminance( 64 );
+ sal_uLong nRed = mpData->maLightColor.GetRed();
+ sal_uLong nGreen = mpData->maLightColor.GetGreen();
+ sal_uLong nBlue = mpData->maLightColor.GetBlue();
+ nRed += (sal_uLong)(mpData->maShadowColor.GetRed());
+ nGreen += (sal_uLong)(mpData->maShadowColor.GetGreen());
+ nBlue += (sal_uLong)(mpData->maShadowColor.GetBlue());
+ mpData->maCheckedColor = Color( (sal_uInt8)(nRed/2),
(sal_uInt8)(nGreen/2), (sal_uInt8)(nBlue/2) );
+ }
+ else
+ {
+ mpData->maCheckedColor = Color( 0x99, 0x99, 0x99 );
+ mpData->maLightColor = Color( COL_WHITE );
+ mpData->maShadowColor = Color( COL_GRAY );
+ }
}
// -----------------------------------------------------------------------
@@ -795,9 +793,9 @@ sal_uLong StyleSettings::GetCurrentSymbolsStyle() const
}
if (GetHighContrastMode() && CheckSymbolStyle
(STYLE_SYMBOLS_HICONTRAST) )
- nStyle = STYLE_SYMBOLS_HICONTRAST;
+ nStyle = STYLE_SYMBOLS_HICONTRAST;
else
- nStyle = nPreferredStyle;
+ nStyle = nPreferredStyle;
}
return nStyle;
@@ -807,178 +805,178 @@ sal_uLong StyleSettings::GetCurrentSymbolsStyle() const
sal_uLong StyleSettings::GetAutoSymbolsStyle() const
{
- sal_uLong nRet = STYLE_SYMBOLS_DEFAULT;
+ sal_uLong nRet = STYLE_SYMBOLS_DEFAULT;
- try
- {
- const ::com::sun::star::uno::Any aAny(
::utl::ConfigManager::GetDirectConfigProperty(
::utl::ConfigManager::OPENSOURCECONTEXT ) );
- sal_Int32 nValue( 0 );
+ try
+ {
+ const ::com::sun::star::uno::Any aAny(
::utl::ConfigManager::GetDirectConfigProperty(
::utl::ConfigManager::OPENSOURCECONTEXT ) );
+ sal_Int32 nValue( 0 );
- aAny >>= nValue;
- }
- catch ( ::com::sun::star::uno::Exception& )
- {
- }
+ aAny >>= nValue;
+ }
+ catch ( ::com::sun::star::uno::Exception& )
+ {
+ }
- // falback to any existing style
- if ( ! CheckSymbolStyle (nRet) )
- {
- for ( sal_uLong n = 0 ; n <= STYLE_SYMBOLS_THEMES_MAX ; n++ )
- {
- sal_uLong nStyleToCheck = n;
+ // fallback to any existing style
+ if ( ! CheckSymbolStyle (nRet) )
+ {
+ for ( sal_uLong n = 0 ; n <= STYLE_SYMBOLS_THEMES_MAX ; n++ )
+ {
+ sal_uLong nStyleToCheck = n;
- // auto is not a real theme => can't be fallback
- if ( nStyleToCheck == STYLE_SYMBOLS_AUTO )
- continue;
+ // auto is not a real theme => can't be fallback
+ if ( nStyleToCheck == STYLE_SYMBOLS_AUTO )
+ continue;
- // will check hicontrast in the end
- if ( nStyleToCheck == STYLE_SYMBOLS_HICONTRAST )
- continue;
- if ( nStyleToCheck == STYLE_SYMBOLS_THEMES_MAX )
- nStyleToCheck = STYLE_SYMBOLS_HICONTRAST;
+ // will check hicontrast in the end
+ if ( nStyleToCheck == STYLE_SYMBOLS_HICONTRAST )
+ continue;
+ if ( nStyleToCheck == STYLE_SYMBOLS_THEMES_MAX )
+ nStyleToCheck = STYLE_SYMBOLS_HICONTRAST;
- if ( CheckSymbolStyle ( nStyleToCheck ) )
- {
- nRet = nStyleToCheck;
- n = STYLE_SYMBOLS_THEMES_MAX;
- }
- }
- }
+ if ( CheckSymbolStyle ( nStyleToCheck ) )
+ {
+ nRet = nStyleToCheck;
+ n = STYLE_SYMBOLS_THEMES_MAX;
+ }
+ }
+ }
- return nRet;
+ return nRet;
}
// -----------------------------------------------------------------------
bool StyleSettings::CheckSymbolStyle( sal_uLong nStyle ) const
{
- static ImplImageTreeSingletonRef aImageTree;
- return aImageTree->checkStyle( ImplSymbolsStyleToName( nStyle ) );
+ static ImplImageTreeSingletonRef aImageTree;
+ return aImageTree->checkStyle( ImplSymbolsStyleToName( nStyle ) );
}
// -----------------------------------------------------------------------
void StyleSettings::SetStandardStyles()
{
- CopyData();
- mpData->SetStandardStyles();
+ CopyData();
+ mpData->SetStandardStyles();
}
// -----------------------------------------------------------------------
Color StyleSettings::GetFaceGradientColor() const
{
- // compute a brighter face color that can be used in gradients
- // for a convex look (eg toolbars)
+ // compute a brighter face color that can be used in gradients
+ // for a convex look (e.g. toolbars)
- sal_uInt16 h, s, b;
- GetFaceColor().RGBtoHSB( h, s, b );
- if( s > 1) s=1;
- if( b < 98) b=98;
- return Color( Color::HSBtoRGB( h, s, b ) );
+ sal_uInt16 h, s, b;
+ GetFaceColor().RGBtoHSB( h, s, b );
+ if( s > 1) s=1;
+ if( b < 98) b=98;
+ return Color( Color::HSBtoRGB( h, s, b ) );
}
// -----------------------------------------------------------------------
Color StyleSettings::GetSeparatorColor() const
{
- // compute a brighter shadow color for separators (used in toolbars or
between menubar and toolbars on Windows XP)
- sal_uInt16 h, s, b;
- GetShadowColor().RGBtoHSB( h, s, b );
- b += b/4;
- s -= s/4;
- return Color( Color::HSBtoRGB( h, s, b ) );
+ // compute a brighter shadow color for separators (used in toolbars or
between menubar and toolbars on Windows XP)
+ sal_uInt16 h, s, b;
+ GetShadowColor().RGBtoHSB( h, s, b );
+ b += b/4;
+ s -= s/4;
+ return Color( Color::HSBtoRGB( h, s, b ) );
}
// -----------------------------------------------------------------------
const StyleSettings& StyleSettings::operator =( const StyleSettings& rSet )
{
- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "StyleSettings: RefCount
overflow" );
+ DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "StyleSettings:
RefCount overflow" );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
- rSet.mpData->mnRefCount++;
+ // Zuerst Referenzcounter erhöhen, damit man sich selbst zuweisen kann
+ rSet.mpData->mnRefCount++;
- // Daten loeschen, wenn letzte Referenz
- if ( mpData->mnRefCount == 1 )
- delete mpData;
- else
- mpData->mnRefCount--;
+ // Daten löschen, wenn letzte Referenz
+ if ( mpData->mnRefCount == 1 )
+ delete mpData;
+ else
+ mpData->mnRefCount--;
- mpData = rSet.mpData;
+ mpData = rSet.mpData;
- return *this;
+ return *this;
}
// -----------------------------------------------------------------------
void StyleSettings::CopyData()
{
- // Falls noch andere Referenzen bestehen, dann kopieren
- if ( mpData->mnRefCount != 1 )
- {
- mpData->mnRefCount--;
- mpData = new ImplStyleData( *mpData );
- }
+ // Falls noch andere Referenzen bestehen, dann kopieren
+ if ( mpData->mnRefCount != 1 )
+ {
+ mpData->mnRefCount--;
+ mpData = new ImplStyleData( *mpData );
+ }
}
// -----------------------------------------------------------------------
inline sal_Bool ImplIsBlackOrWhite( const Color& rColor )
{
- sal_uInt8 nLuminance = rColor.GetLuminance();
- return ( nLuminance < 8 ) || ( nLuminance > 250 );
+ sal_uInt8 nLuminance = rColor.GetLuminance();
+ return ( nLuminance < 8 ) || ( nLuminance > 250 );
}
sal_Bool StyleSettings::IsHighContrastBlackAndWhite() const
{
- sal_Bool bBWOnly = sal_True;
-
- // Only use B&W if fully B&W, like on GNOME.
- // Some colors like CheckedColor and HighlightColor are not B&W in Windows
Standard HC Black,
- // and we don't want to be B&W then, so check these color first, very
probably not B&W.
-
- // Unfortunately, GNOME uses a very very dark color (0x000033) instead of
BLACK (0x000000)
-
- if ( !ImplIsBlackOrWhite( GetFaceColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetHighlightTextColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetWindowColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetWindowTextColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetButtonTextColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetButtonTextColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetGroupTextColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetLabelTextColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetDialogColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetFieldColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetMenuColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetMenuBarColor() ) )
- bBWOnly = sal_False;
- else if ( !ImplIsBlackOrWhite( GetMenuHighlightColor() ) )
- bBWOnly = sal_False;
-
- return bBWOnly;
+ sal_Bool bBWOnly = sal_True;
+
+ // Only use B&W if fully B&W, like on GNOME.
+ // Some colors like CheckedColor and HighlightColor are not B&W in
Windows Standard HC Black,
+ // and we don't want to be B&W then, so check these color first, very
probably not B&W.
+
+ // Unfortunately, GNOME uses a very very dark color (0x000033) instead
of BLACK (0x000000)
+
+ if ( !ImplIsBlackOrWhite( GetFaceColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetHighlightTextColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetWindowColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetWindowTextColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetButtonTextColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetButtonTextColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetGroupTextColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetLabelTextColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetDialogColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetFieldColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetMenuColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetMenuBarColor() ) )
+ bBWOnly = sal_False;
+ else if ( !ImplIsBlackOrWhite( GetMenuHighlightColor() ) )
+ bBWOnly = sal_False;
+
+ return bBWOnly;
}
// -----------------------------------------------------------------------
sal_Bool StyleSettings::operator ==( const StyleSettings& rSet ) const
{
- if ( mpData == rSet.mpData )
- return sal_True;
+ if ( mpData == rSet.mpData )
+ return sal_True;
- if ( (mpData->mnOptions == rSet.mpData->mnOptions)
&&
- (mpData->mnAutoMnemonic ==
rSet.mpData->mnAutoMnemonic) &&
+ if ( (mpData->mnOptions ==
rSet.mpData->mnOptions) &&
+ (mpData->mnAutoMnemonic ==
rSet.mpData->mnAutoMnemonic) &&
(mpData->mnLogoDisplayTime == rSet.mpData->mnLogoDisplayTime)
&&
(mpData->mnDragFullOptions == rSet.mpData->mnDragFullOptions)
&&
(mpData->mnAnimationOptions ==
rSet.mpData->mnAnimationOptions) &&
@@ -997,14 +995,14 @@ sal_Bool StyleSettings::operator ==( const StyleSettings&
rSet ) const
(mpData->mnSpinSize == rSet.mpData->mnSpinSize)
&&
(mpData->mnIconHorzSpace == rSet.mpData->mnIconHorzSpace)
&&
(mpData->mnIconVertSpace == rSet.mpData->mnIconVertSpace)
&&
- (mpData->mnAntialiasedMin == rSet.mpData->mnAntialiasedMin)
&&
- (mpData->mnScreenZoom == rSet.mpData->mnScreenZoom)
&&
- (mpData->mnScreenFontZoom == rSet.mpData->mnScreenFontZoom)
&&
+ (mpData->mnAntialiasedMin ==
rSet.mpData->mnAntialiasedMin) &&
+ (mpData->mnScreenZoom ==
rSet.mpData->mnScreenZoom) &&
+ (mpData->mnScreenFontZoom ==
rSet.mpData->mnScreenFontZoom) &&
(mpData->mnHighContrast ==
rSet.mpData->mnHighContrast) &&
(mpData->mnUseSystemUIFonts ==
rSet.mpData->mnUseSystemUIFonts) &&
(mpData->mnUseFlatBorders ==
rSet.mpData->mnUseFlatBorders) &&
(mpData->mnUseFlatMenues ==
rSet.mpData->mnUseFlatMenues) &&
- (mpData->mnSymbolsStyle ==
rSet.mpData->mnSymbolsStyle) &&
+ (mpData->mnSymbolsStyle ==
rSet.mpData->mnSymbolsStyle) &&
(mpData->mnPreferredSymbolsStyle ==
rSet.mpData->mnPreferredSymbolsStyle) &&
(mpData->maFaceColor == rSet.mpData->maFaceColor)
&&
(mpData->maCheckedColor == rSet.mpData->maCheckedColor)
&&
@@ -1077,15 +1075,15 @@ sal_Bool StyleSettings::operator ==( const
StyleSettings& rSet ) const
(mpData->mnListBoxPreviewDefaultLineWidth ==
rSet.mpData->mnListBoxPreviewDefaultLineWidth) &&
(mpData->mbPreviewUsesCheckeredBackground ==
rSet.mpData->mbPreviewUsesCheckeredBackground))
return sal_True;
- else
- return sal_False;
+ else
+ return sal_False;
}
// =======================================================================
ImplMiscData::ImplMiscData()
{
- mnRefCount = 1;
+ mnRefCount = 1;
mnEnableATT =
sal::static_int_cast<sal_uInt16>(~0U);
mnDisablePrinting = sal::static_int_cast<sal_uInt16>(~0U);
static const char* pEnv = getenv("SAL_DECIMALSEP_ENABLED" ); // set
default without UI
@@ -1106,25 +1104,25 @@ ImplMiscData::ImplMiscData( const ImplMiscData& rData )
MiscSettings::MiscSettings()
{
- mpData = new ImplMiscData();
+ mpData = new ImplMiscData();
}
// -----------------------------------------------------------------------
MiscSettings::MiscSettings( const MiscSettings& rSet )
{
- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MiscSettings: RefCount
overflow" );
+ DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MiscSettings:
RefCount overflow" );
- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
- mpData = rSet.mpData;
- mpData->mnRefCount++;
+ // shared Instance Daten übernehmen und Referenzcounter erhöhen
+ mpData = rSet.mpData;
+ mpData->mnRefCount++;
}
// -----------------------------------------------------------------------
MiscSettings::~MiscSettings()
{
- // Daten loeschen, wenn letzte Referenz
+ // Daten löschen, wenn letzte Referenz
if ( mpData->mnRefCount == 1 )
delete mpData;
else
@@ -1137,10 +1135,10 @@ const MiscSettings& MiscSettings::operator =( const
MiscSettings& rSet )
{
DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "MiscSettings: RefCount
overflow" );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
+ // Zuerst Referenzcounter erhöhen, damit man sich selbst zuweisen kann
rSet.mpData->mnRefCount++;
- // Daten loeschen, wenn letzte Referenz
+ // Daten löschen, wenn letzte Referenz
if ( mpData->mnRefCount == 1 )
delete mpData;
else
@@ -1155,20 +1153,20 @@ const MiscSettings& MiscSettings::operator =( const
MiscSettings& rSet )
void MiscSettings::CopyData()
{
- // Falls noch andere Referenzen bestehen, dann kopieren
- if ( mpData->mnRefCount != 1 )
- {
- mpData->mnRefCount--;
- mpData = new ImplMiscData( *mpData );
- }
+ // Falls noch andere Referenzen bestehen, dann kopieren
+ if ( mpData->mnRefCount != 1 )
+ {
+ mpData->mnRefCount--;
+ mpData = new ImplMiscData( *mpData );
+ }
}
// -----------------------------------------------------------------------
sal_Bool MiscSettings::operator ==( const MiscSettings& rSet ) const
{
- if ( mpData == rSet.mpData )
- return sal_True;
+ if ( mpData == rSet.mpData )
+ return sal_True;
if ( (mpData->mnEnableATT == rSet.mpData->mnEnableATT ) &&
(mpData->mnDisablePrinting ==
rSet.mpData->mnDisablePrinting ) &&
@@ -1191,7 +1189,7 @@ sal_Bool MiscSettings::GetDisablePrinting() const
mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCaseAscii( "true"
) ? 1 : 0;
}
- return (sal_Bool)mpData->mnDisablePrinting;
+ return (sal_Bool)mpData->mnDisablePrinting;
}
// -----------------------------------------------------------------------
@@ -1202,7 +1200,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
if( mpData->mnEnableATT == (sal_uInt16)~0 )
{
// Check in the Windows registry if an AT tool wants Accessibility
support to
- // be activated ..
+ // be activated...
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
@@ -1252,37 +1250,37 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
}
}
- return (sal_Bool)mpData->mnEnableATT;
+ return (sal_Bool)mpData->mnEnableATT;
}
// -----------------------------------------------------------------------
void MiscSettings::SetDisablePrinting( sal_Bool bEnable )
{
- if ( bEnable != mpData->mnDisablePrinting )
- {
+ if ( bEnable != mpData->mnDisablePrinting )
+ {
vcl::SettingsConfigItem::get()->
setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"DesktopManagement" ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"DisablePrinting" ) ),
rtl::OUString::createFromAscii( bEnable ? "true" :
"false" ) );
mpData->mnDisablePrinting = bEnable ? 1 : 0;
- }
+ }
}
// -----------------------------------------------------------------------
void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
{
- if ( bEnable != mpData->mnEnableATT )
- {
- sal_Bool bDummy;
- if( bEnable && !ImplInitAccessBridge(false, bDummy) )
- return;
+ if ( bEnable != mpData->mnEnableATT )
+ {
+ sal_Bool bDummy;
+ if( bEnable && !ImplInitAccessBridge(false, bDummy) )
+ return;
#ifdef WNT
HKEY hkey;
- // If the accessibility key in the Windows registry exists, change it
synchronously
+ // If the accessibility key in the Windows registry exists,
change it synchronously
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
"Software\\OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
@@ -1314,7 +1312,7 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool
bEnable )
}
RegCloseKey(hkey);
- }
+ }
#endif
vcl::SettingsConfigItem::get()->
@@ -1327,36 +1325,36 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool
bEnable )
void MiscSettings::SetEnableLocalizedDecimalSep( sal_Bool bEnable )
{
- CopyData();
- mpData->mbEnableLocalizedDecimalSep = bEnable;
+ CopyData();
+ mpData->mbEnableLocalizedDecimalSep = bEnable;
}
sal_Bool MiscSettings::GetEnableLocalizedDecimalSep() const
{
- return mpData->mbEnableLocalizedDecimalSep;
+ return mpData->mbEnableLocalizedDecimalSep;
}
// =======================================================================
ImplNotificationData::ImplNotificationData()
{
- mnRefCount = 1;
- mnOptions = 0;
+ mnRefCount = 1;
+ mnOptions = 0;
}
// -----------------------------------------------------------------------
ImplNotificationData::ImplNotificationData( const ImplNotificationData& rData )
{
- mnRefCount = 1;
- mnOptions = rData.mnOptions;
+ mnRefCount = 1;
+ mnOptions = rData.mnOptions;
}
// -----------------------------------------------------------------------
NotificationSettings::NotificationSettings()
{
- mpData = new ImplNotificationData();
+ mpData = new ImplNotificationData();
}
// -----------------------------------------------------------------------
@@ -1365,7 +1363,7 @@ NotificationSettings::NotificationSettings( const
NotificationSettings& rSet )
{
DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "NotificationSettings:
RefCount overflow" );
- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
+ // shared Instance Daten übernehmen und Referenzcounter erhöhen
mpData = rSet.mpData;
mpData->mnRefCount++;
}
@@ -1374,7 +1372,7 @@ NotificationSettings::NotificationSettings( const
NotificationSettings& rSet )
NotificationSettings::~NotificationSettings()
{
- // Daten loeschen, wenn letzte Referenz
+ // Daten löschen, wenn letzte Referenz
if ( mpData->mnRefCount == 1 )
delete mpData;
else
@@ -1387,10 +1385,10 @@ const NotificationSettings&
NotificationSettings::operator =( const Notification
{
DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "NotificationSettings:
RefCount overflow" );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
+ // Zuerst Referenzcounter erhöhen, damit man sich selbst zuweisen kann
rSet.mpData->mnRefCount++;
- // Daten loeschen, wenn letzte Referenz
+ // Daten löschen, wenn letzte Referenz
if ( mpData->mnRefCount == 1 )
delete mpData;
else
@@ -1458,7 +1456,7 @@ HelpSettings::HelpSettings( const HelpSettings& rSet )
{
DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "HelpSettings: RefCount
overflow" );
- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
+ // shared Instance Daten übernehmen und Referenzcounter erhöhen
mpData = rSet.mpData;
mpData->mnRefCount++;
}
@@ -1467,7 +1465,7 @@ HelpSettings::HelpSettings( const HelpSettings& rSet )
HelpSettings::~HelpSettings()
{
- // Daten loeschen, wenn letzte Referenz
+ // Daten löschen, wenn letzte Referenz
if ( mpData->mnRefCount == 1 )
delete mpData;
else
@@ -1480,18 +1478,18 @@ const HelpSettings& HelpSettings::operator =( const
HelpSettings& rSet )
{
DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "HelpSettings: RefCount
overflow" );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
+ // Zuerst Referenzcounter erhöhen, damit man sich selbst zuweisen kann
rSet.mpData->mnRefCount++;
- // Daten loeschen, wenn letzte Referenz
+ // Daten löschen, wenn letzte Referenz
if ( mpData->mnRefCount == 1 )
delete mpData;
else
mpData->mnRefCount--;
- mpData = rSet.mpData;
+ mpData = rSet.mpData;
- return *this;
+ return *this;
}
// -----------------------------------------------------------------------
@@ -1510,311 +1508,311 @@ void HelpSettings::CopyData()
sal_Bool HelpSettings::operator ==( const HelpSettings& rSet ) const
{
- if ( mpData == rSet.mpData )
- return sal_True;
+ if ( mpData == rSet.mpData )
+ return sal_True;
- if ( (mpData->mnOptions == rSet.mpData->mnOptions ) &&
+ if ( (mpData->mnOptions == rSet.mpData->mnOptions ) &&
(mpData->mnTipDelay == rSet.mpData->mnTipDelay ) &&
(mpData->mnTipTimeout == rSet.mpData->mnTipTimeout ) &&
(mpData->mnBalloonDelay == rSet.mpData->mnBalloonDelay ) )
return sal_True;
- else
- return sal_False;
+ else
+ return sal_False;
}
// =======================================================================
ImplAllSettingsData::ImplAllSettingsData()
{
- mnRefCount = 1;
- mnSystemUpdate = SETTINGS_ALLSETTINGS;
- mnWindowUpdate = SETTINGS_ALLSETTINGS;
- meLanguage = LANGUAGE_SYSTEM;
- meUILanguage = LANGUAGE_SYSTEM;
- mpLocaleDataWrapper = NULL;
- mpUILocaleDataWrapper = NULL;
- mpCollatorWrapper = NULL;
- mpUICollatorWrapper = NULL;
- mpI18nHelper = NULL;
- mpUII18nHelper = NULL;
+ mnRefCount = 1;
+ mnSystemUpdate = SETTINGS_ALLSETTINGS;
+ mnWindowUpdate = SETTINGS_ALLSETTINGS;
+ meLanguage = LANGUAGE_SYSTEM;
+ meUILanguage = LANGUAGE_SYSTEM;
+ mpLocaleDataWrapper = NULL;
+ mpUILocaleDataWrapper = NULL;
+ mpCollatorWrapper = NULL;
+ mpUICollatorWrapper = NULL;
+ mpI18nHelper = NULL;
+ mpUII18nHelper = NULL;
maMiscSettings.SetEnableLocalizedDecimalSep(
maSysLocale.GetOptions().IsDecimalSeparatorAsLocale() );
}
// -----------------------------------------------------------------------
ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) :
- maMouseSettings( rData.maMouseSettings ),
- maKeyboardSettings( rData.maKeyboardSettings ),
- maStyleSettings( rData.maStyleSettings ),
- maMiscSettings( rData.maMiscSettings ),
- maNotificationSettings( rData.maNotificationSettings ),
- maHelpSettings( rData.maHelpSettings ),
- maLocale( rData.maLocale )
-{
- mnRefCount = 1;
- mnSystemUpdate = rData.mnSystemUpdate;
- mnWindowUpdate = rData.mnWindowUpdate;
- meLanguage = rData.meLanguage;
- // Pointer couldn't shared and objects haven't a copy ctor
- // So we create the cache objects new, if the GetFunction is
- // called
- mpLocaleDataWrapper = NULL;
- mpUILocaleDataWrapper = NULL;
- mpCollatorWrapper = NULL;
- mpUICollatorWrapper = NULL;
- mpI18nHelper = NULL;
- mpUII18nHelper = NULL;
+ maMouseSettings( rData.maMouseSettings ),
+ maKeyboardSettings( rData.maKeyboardSettings ),
+ maStyleSettings( rData.maStyleSettings ),
+ maMiscSettings( rData.maMiscSettings ),
+ maNotificationSettings( rData.maNotificationSettings ),
+ maHelpSettings( rData.maHelpSettings ),
+ maLocale( rData.maLocale )
+{
+ mnRefCount = 1;
+ mnSystemUpdate = rData.mnSystemUpdate;
+ mnWindowUpdate = rData.mnWindowUpdate;
+ meLanguage = rData.meLanguage;
+ // Pointer couldn't shared and objects haven't a copy ctor
+ // So we create the cache objects new, if the GetFunction is
+ // called
+ mpLocaleDataWrapper = NULL;
+ mpUILocaleDataWrapper = NULL;
+ mpCollatorWrapper = NULL;
+ mpUICollatorWrapper = NULL;
+ mpI18nHelper = NULL;
+ mpUII18nHelper = NULL;
}
// -----------------------------------------------------------------------
ImplAllSettingsData::~ImplAllSettingsData()
{
- if ( mpLocaleDataWrapper )
- delete mpLocaleDataWrapper;
- if ( mpUILocaleDataWrapper )
- delete mpUILocaleDataWrapper;
- if ( mpCollatorWrapper )
- delete mpCollatorWrapper;
- if ( mpUICollatorWrapper )
- delete mpUICollatorWrapper;
- if ( mpI18nHelper )
- delete mpI18nHelper;
- if ( mpUII18nHelper )
- delete mpUII18nHelper;
+ if ( mpLocaleDataWrapper )
+ delete mpLocaleDataWrapper;
+ if ( mpUILocaleDataWrapper )
+ delete mpUILocaleDataWrapper;
+ if ( mpCollatorWrapper )
+ delete mpCollatorWrapper;
+ if ( mpUICollatorWrapper )
+ delete mpUICollatorWrapper;
+ if ( mpI18nHelper )
+ delete mpI18nHelper;
+ if ( mpUII18nHelper )
+ delete mpUII18nHelper;
}
// -----------------------------------------------------------------------
AllSettings::AllSettings()
{
- DBG_CTOR( AllSettings, NULL );
+ DBG_CTOR( AllSettings, NULL );
- mpData = new ImplAllSettingsData();
+ mpData = new ImplAllSettingsData();
}
// -----------------------------------------------------------------------
AllSettings::AllSettings( const AllSettings& rSet )
{
- DBG_CTOR( AllSettings, NULL );
- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "Settings: RefCount
overflow" );
+ DBG_CTOR( AllSettings, NULL );
+ DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "Settings: RefCount
overflow" );
- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
- mpData = rSet.mpData;
- mpData->mnRefCount++;
+ // shared Instance Daten übernehmen und Referenzcounter erhöhen
+ mpData = rSet.mpData;
+ mpData->mnRefCount++;
}
// -----------------------------------------------------------------------
AllSettings::~AllSettings()
{
- DBG_DTOR( AllSettings, NULL );
+ DBG_DTOR( AllSettings, NULL );
- // Daten loeschen, wenn letzte Referenz
- if ( mpData->mnRefCount == 1 )
- delete mpData;
- else
- mpData->mnRefCount--;
+ // Daten löschen, wenn letzte Referenz
+ if ( mpData->mnRefCount == 1 )
+ delete mpData;
+ else
+ mpData->mnRefCount--;
}
// -----------------------------------------------------------------------
const AllSettings& AllSettings::operator =( const AllSettings& rSet )
{
- DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "AllSettings: RefCount
overflow" );
- DBG_CHKTHIS( AllSettings, NULL );
- DBG_CHKOBJ( &rSet, AllSettings, NULL );
+ DBG_ASSERT( rSet.mpData->mnRefCount < 0xFFFFFFFE, "AllSettings:
RefCount overflow" );
+ DBG_CHKTHIS( AllSettings, NULL );
+ DBG_CHKOBJ( &rSet, AllSettings, NULL );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
- rSet.mpData->mnRefCount++;
+ // Zuerst Referenzcounter erhöhen, damit man sich selbst zuweisen kann
+ rSet.mpData->mnRefCount++;
- // Daten loeschen, wenn letzte Referenz
- if ( mpData->mnRefCount == 1 )
- delete mpData;
- else
- mpData->mnRefCount--;
+ // Daten löschen, wenn letzte Referenz
+ if ( mpData->mnRefCount == 1 )
+ delete mpData;
+ else
+ mpData->mnRefCount--;
- mpData = rSet.mpData;
+ mpData = rSet.mpData;
- return *this;
+ return *this;
}
// -----------------------------------------------------------------------
void AllSettings::CopyData()
{
- DBG_CHKTHIS( AllSettings, NULL );
+ DBG_CHKTHIS( AllSettings, NULL );
- // Falls noch andere Referenzen bestehen, dann kopieren
- if ( mpData->mnRefCount != 1 )
- {
- mpData->mnRefCount--;
- mpData = new ImplAllSettingsData( *mpData );
- }
+ // Falls noch andere Referenzen bestehen, dann kopieren
+ if ( mpData->mnRefCount != 1 )
+ {
+ mpData->mnRefCount--;
+ mpData = new ImplAllSettingsData( *mpData );
+ }
}
// -----------------------------------------------------------------------
sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet )
{
- DBG_CHKTHIS( AllSettings, NULL );
- DBG_CHKOBJ( &rSet, AllSettings, NULL );
+ DBG_CHKTHIS( AllSettings, NULL );
+ DBG_CHKOBJ( &rSet, AllSettings, NULL );
- sal_uLong nChangeFlags = 0;
+ sal_uLong nChangeFlags = 0;
- if ( nFlags & SETTINGS_MACHINE )
- {
- if ( mpData->maMachineSettings != rSet.mpData->maMachineSettings )
- {
- CopyData();
- mpData->maMachineSettings = rSet.mpData->maMachineSettings;
- nChangeFlags |= SETTINGS_MACHINE;
- }
- }
+ if ( nFlags & SETTINGS_MACHINE )
+ {
+ if ( mpData->maMachineSettings !=
rSet.mpData->maMachineSettings )
+ {
+ CopyData();
+ mpData->maMachineSettings =
rSet.mpData->maMachineSettings;
+ nChangeFlags |= SETTINGS_MACHINE;
+ }
+ }
- if ( nFlags & SETTINGS_MOUSE )
- {
- if ( mpData->maMouseSettings != rSet.mpData->maMouseSettings )
- {
- CopyData();
- mpData->maMouseSettings = rSet.mpData->maMouseSettings;
- nChangeFlags |= SETTINGS_MOUSE;
- }
- }
+ if ( nFlags & SETTINGS_MOUSE )
+ {
+ if ( mpData->maMouseSettings != rSet.mpData->maMouseSettings )
+ {
+ CopyData();
+ mpData->maMouseSettings = rSet.mpData->maMouseSettings;
+ nChangeFlags |= SETTINGS_MOUSE;
+ }
+ }
- if ( nFlags & SETTINGS_KEYBOARD )
- {
- if ( mpData->maKeyboardSettings != rSet.mpData->maKeyboardSettings )
- {
- CopyData();
- mpData->maKeyboardSettings = rSet.mpData->maKeyboardSettings;
- nChangeFlags |= SETTINGS_KEYBOARD;
- }
- }
+ if ( nFlags & SETTINGS_KEYBOARD )
+ {
+ if ( mpData->maKeyboardSettings !=
rSet.mpData->maKeyboardSettings )
+ {
+ CopyData();
+ mpData->maKeyboardSettings =
rSet.mpData->maKeyboardSettings;
+ nChangeFlags |= SETTINGS_KEYBOARD;
+ }
+ }
- if ( nFlags & SETTINGS_STYLE )
- {
- if ( mpData->maStyleSettings != rSet.mpData->maStyleSettings )
- {
- CopyData();
- mpData->maStyleSettings = rSet.mpData->maStyleSettings;
- nChangeFlags |= SETTINGS_STYLE;
- }
- }
+ if ( nFlags & SETTINGS_STYLE )
+ {
+ if ( mpData->maStyleSettings != rSet.mpData->maStyleSettings )
+ {
+ CopyData();
+ mpData->maStyleSettings = rSet.mpData->maStyleSettings;
+ nChangeFlags |= SETTINGS_STYLE;
+ }
+ }
- if ( nFlags & SETTINGS_MISC )
- {
- if ( mpData->maMiscSettings != rSet.mpData->maMiscSettings )
- {
- CopyData();
- mpData->maMiscSettings = rSet.mpData->maMiscSettings;
- nChangeFlags |= SETTINGS_MISC;
- }
- }
+ if ( nFlags & SETTINGS_MISC )
+ {
+ if ( mpData->maMiscSettings != rSet.mpData->maMiscSettings )
+ {
+ CopyData();
+ mpData->maMiscSettings = rSet.mpData->maMiscSettings;
+ nChangeFlags |= SETTINGS_MISC;
+ }
+ }
- if ( nFlags & SETTINGS_NOTIFICATION )
- {
- if ( mpData->maNotificationSettings !=
rSet.mpData->maNotificationSettings )
- {
- CopyData();
- mpData->maNotificationSettings =
rSet.mpData->maNotificationSettings;
- nChangeFlags |= SETTINGS_NOTIFICATION;
- }
- }
+ if ( nFlags & SETTINGS_NOTIFICATION )
+ {
+ if ( mpData->maNotificationSettings !=
rSet.mpData->maNotificationSettings )
+ {
+ CopyData();
+ mpData->maNotificationSettings =
rSet.mpData->maNotificationSettings;
+ nChangeFlags |= SETTINGS_NOTIFICATION;
+ }
+ }
- if ( nFlags & SETTINGS_HELP )
- {
- if ( mpData->maHelpSettings != rSet.mpData->maHelpSettings )
- {
- CopyData();
- mpData->maHelpSettings = rSet.mpData->maHelpSettings;
- nChangeFlags |= SETTINGS_HELP;
- }
- }
+ if ( nFlags & SETTINGS_HELP )
+ {
+ if ( mpData->maHelpSettings != rSet.mpData->maHelpSettings )
+ {
+ CopyData();
+ mpData->maHelpSettings = rSet.mpData->maHelpSettings;
+ nChangeFlags |= SETTINGS_HELP;
+ }
+ }
- if ( nFlags & SETTINGS_INTERNATIONAL )
- {
- // Nothing, class International is gone.
- DBG_ERRORFILE("AllSettings::Update: who calls with
SETTINGS_INTERNATIONAL and why? You're flogging a dead horse.");
- }
+ if ( nFlags & SETTINGS_INTERNATIONAL )
+ {
+ // Nothing, class International is gone.
+ DBG_ERRORFILE("AllSettings::Update: who calls with
SETTINGS_INTERNATIONAL and why? You're flogging a dead horse.");
+ }
- if ( nFlags & SETTINGS_LOCALE )
- {
- if ( mpData->meLanguage || rSet.mpData->meLanguage )
- {
- SetLanguage( rSet.mpData->meLanguage );
- nChangeFlags |= SETTINGS_LOCALE;
- }
- }
+ if ( nFlags & SETTINGS_LOCALE )
+ {
+ if ( mpData->meLanguage || rSet.mpData->meLanguage )
+ {
+ SetLanguage( rSet.mpData->meLanguage );
+ nChangeFlags |= SETTINGS_LOCALE;
+ }
+ }
- if ( nFlags & SETTINGS_UILOCALE )
- {
+ if ( nFlags & SETTINGS_UILOCALE )
+ {
// UILocale can't be changed
- }
+ }
- return nChangeFlags;
+ return nChangeFlags;
}
// -----------------------------------------------------------------------
sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const
{
- DBG_CHKTHIS( AllSettings, NULL );
- DBG_CHKOBJ( &rSet, AllSettings, NULL );
+ DBG_CHKTHIS( AllSettings, NULL );
+ DBG_CHKOBJ( &rSet, AllSettings, NULL );
- sal_uLong nChangeFlags = 0;
+ sal_uLong nChangeFlags = 0;
- if ( mpData->maMachineSettings != rSet.mpData->maMachineSettings )
- nChangeFlags |= SETTINGS_MACHINE;
+ if ( mpData->maMachineSettings != rSet.mpData->maMachineSettings )
+ nChangeFlags |= SETTINGS_MACHINE;
- if ( mpData->maMouseSettings != rSet.mpData->maMouseSettings )
- nChangeFlags |= SETTINGS_MOUSE;
+ if ( mpData->maMouseSettings != rSet.mpData->maMouseSettings )
+ nChangeFlags |= SETTINGS_MOUSE;
- if ( mpData->maKeyboardSettings != rSet.mpData->maKeyboardSettings )
- nChangeFlags |= SETTINGS_KEYBOARD;
+ if ( mpData->maKeyboardSettings != rSet.mpData->maKeyboardSettings )
+ nChangeFlags |= SETTINGS_KEYBOARD;
- if ( mpData->maStyleSettings != rSet.mpData->maStyleSettings )
- nChangeFlags |= SETTINGS_STYLE;
+ if ( mpData->maStyleSettings != rSet.mpData->maStyleSettings )
+ nChangeFlags |= SETTINGS_STYLE;
- if ( mpData->maMiscSettings != rSet.mpData->maMiscSettings )
- nChangeFlags |= SETTINGS_MISC;
+ if ( mpData->maMiscSettings != rSet.mpData->maMiscSettings )
+ nChangeFlags |= SETTINGS_MISC;
- if ( mpData->maNotificationSettings != rSet.mpData->maNotificationSettings
)
- nChangeFlags |= SETTINGS_NOTIFICATION;
+ if ( mpData->maNotificationSettings !=
rSet.mpData->maNotificationSettings )
+ nChangeFlags |= SETTINGS_NOTIFICATION;
- if ( mpData->maHelpSettings != rSet.mpData->maHelpSettings )
- nChangeFlags |= SETTINGS_HELP;
+ if ( mpData->maHelpSettings != rSet.mpData->maHelpSettings )
+ nChangeFlags |= SETTINGS_HELP;
- if ( mpData->meLanguage || rSet.mpData->meLanguage )
- nChangeFlags |= SETTINGS_LOCALE;
+ if ( mpData->meLanguage || rSet.mpData->meLanguage )
+ nChangeFlags |= SETTINGS_LOCALE;
- return nChangeFlags;
+ return nChangeFlags;
}
// -----------------------------------------------------------------------
sal_Bool AllSettings::operator ==( const AllSettings& rSet ) const
{
- DBG_CHKTHIS( AllSettings, NULL );
- DBG_CHKOBJ( &rSet, AllSettings, NULL );
-
- if ( mpData == rSet.mpData )
- return sal_True;
-
- if ( (mpData->maMachineSettings == rSet.mpData->maMachineSettings)
&&
- (mpData->maMouseSettings == rSet.mpData->maMouseSettings)
&&
- (mpData->maKeyboardSettings ==
rSet.mpData->maKeyboardSettings) &&
- (mpData->maStyleSettings == rSet.mpData->maStyleSettings)
&&
- (mpData->maMiscSettings == rSet.mpData->maMiscSettings)
&&
- (mpData->maNotificationSettings ==
rSet.mpData->maNotificationSettings) &&
- (mpData->maHelpSettings == rSet.mpData->maHelpSettings)
&&
- (mpData->mnSystemUpdate == rSet.mpData->mnSystemUpdate)
&&
- (mpData->maLocale ==
rSet.mpData->maLocale) &&
- (mpData->mnWindowUpdate == rSet.mpData->mnWindowUpdate) )
- {
- return sal_True;
- }
+ DBG_CHKTHIS( AllSettings, NULL );
+ DBG_CHKOBJ( &rSet, AllSettings, NULL );
+
+ if ( mpData == rSet.mpData )
+ return sal_True;
+
+ if ( (mpData->maMachineSettings ==
rSet.mpData->maMachineSettings) &&
+ (mpData->maMouseSettings ==
rSet.mpData->maMouseSettings) &&
+ (mpData->maKeyboardSettings ==
rSet.mpData->maKeyboardSettings) &&
+ (mpData->maStyleSettings ==
rSet.mpData->maStyleSettings) &&
+ (mpData->maMiscSettings ==
rSet.mpData->maMiscSettings) &&
+ (mpData->maNotificationSettings ==
rSet.mpData->maNotificationSettings) &&
+ (mpData->maHelpSettings ==
rSet.mpData->maHelpSettings) &&
+ (mpData->mnSystemUpdate ==
rSet.mpData->mnSystemUpdate) &&
+ (mpData->maLocale ==
rSet.mpData->maLocale) &&
+ (mpData->mnWindowUpdate ==
rSet.mpData->mnWindowUpdate) )
+ {
+ return sal_True;
+ }
else
return sal_False;
}
@@ -1884,55 +1882,55 @@ void AllSettings::SetUILanguage( LanguageType )
sal_Bool AllSettings::GetLayoutRTL() const
{
- static const char* pEnv = getenv("SAL_RTL_ENABLED" );
- static int nUIMirroring = -1; // -1: undef, 0: auto, 1: on 2: off
+ static const char* pEnv = getenv("SAL_RTL_ENABLED" );
+ static int nUIMirroring = -1; // -1: undef, 0: auto, 1: on 2: off
- // environment always overrides
- if( pEnv )
- return true;
+ // environment always overrides
+ if( pEnv )
+ return true;
- sal_Bool bRTL = sal_False;
+ sal_Bool bRTL = sal_False;
- if( nUIMirroring == -1 )
- {
- nUIMirroring = 0; // ask configuration only once
- utl::OConfigurationNode aNode =
utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
- vcl::unohelper::GetMultiServiceFactory(),
- OUString::createFromAscii( "org.openoffice.Office.Common/I18N/CTL"
) ); // note: case sensitive !
- if ( aNode.isValid() )
- {
- sal_Bool bTmp = sal_Bool();
- ::com::sun::star::uno::Any aValue = aNode.getNodeValue(
OUString::createFromAscii( "UIMirroring" ) );
- if( aValue >>= bTmp )
- {
- // found true or false; if it was nil, nothing is changed
- nUIMirroring = bTmp ? 1 : 2;
- }
- }
- }
+ if( nUIMirroring == -1 )
+ {
+ nUIMirroring = 0; // ask configuration only once
+ utl::OConfigurationNode aNode =
utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
+ vcl::unohelper::GetMultiServiceFactory(),
+ OUString::createFromAscii(
"org.openoffice.Office.Common/I18N/CTL" ) ); // note: case sensitive !
+ if ( aNode.isValid() )
+ {
+ sal_Bool bTmp = sal_Bool();
+ ::com::sun::star::uno::Any aValue = aNode.getNodeValue(
OUString::createFromAscii( "UIMirroring" ) );
+ if( aValue >>= bTmp )
+ {
+ // found true or false; if it was nil, nothing
is changed
+ nUIMirroring = bTmp ? 1 : 2;
+ }
+ }
+ }
- if( nUIMirroring == 0 ) // no config found (eg, setup) or default (nil)
was set: check language
- {
- LanguageType aLang = LANGUAGE_DONTKNOW;
- ImplSVData* pSVData = ImplGetSVData();
- if ( pSVData->maAppData.mpSettings )
- aLang = pSVData->maAppData.mpSettings->GetUILanguage();
- bRTL = MsLangId::isRightToLeft( aLang );
- }
- else
- bRTL = (nUIMirroring == 1);
+ if( nUIMirroring == 0 ) // no config found (e.g. setup) or default
(nil) was set: check language
+ {
+ LanguageType aLang = LANGUAGE_DONTKNOW;
+ ImplSVData* pSVData = ImplGetSVData();
+ if ( pSVData->maAppData.mpSettings )
+ aLang = pSVData->maAppData.mpSettings->GetUILanguage();
+ bRTL = MsLangId::isRightToLeft( aLang );
+ }
+ else
+ bRTL = (nUIMirroring == 1);
- return bRTL;
+ return bRTL;
}
// -----------------------------------------------------------------------
const ::com::sun::star::lang::Locale& AllSettings::GetLocale() const
{
- if ( !mpData->maLocale.Language.getLength() )
+ if ( !mpData->maLocale.Language.getLength() )
mpData->maLocale = mpData->maSysLocale.GetLocale();
- return mpData->maLocale;
+ return mpData->maLocale;
}
// -----------------------------------------------------------------------
@@ -1940,10 +1938,10 @@ const ::com::sun::star::lang::Locale&
AllSettings::GetLocale() const
const ::com::sun::star::lang::Locale& AllSettings::GetUILocale() const
{
// the UILocale is never changed
- if ( !mpData->maUILocale.Language.getLength() )
+ if ( !mpData->maUILocale.Language.getLength() )
mpData->maUILocale = mpData->maSysLocale.GetUILocale();
- return mpData->maUILocale;
+ return mpData->maUILocale;
}
// -----------------------------------------------------------------------
@@ -1951,10 +1949,10 @@ const ::com::sun::star::lang::Locale&
AllSettings::GetUILocale() const
LanguageType AllSettings::GetLanguage() const
{
// meLanguage == LANGUAGE_SYSTEM means: use settings from SvtSysLocale
- if ( mpData->meLanguage == LANGUAGE_SYSTEM )
- return mpData->maSysLocale.GetLanguage();
+ if ( mpData->meLanguage == LANGUAGE_SYSTEM )
+ return mpData->maSysLocale.GetLanguage();
- return mpData->meLanguage;
+ return mpData->meLanguage;
}
// -----------------------------------------------------------------------
@@ -1969,65 +1967,64 @@ LanguageType AllSettings::GetUILanguage() const
const LocaleDataWrapper& AllSettings::GetLocaleDataWrapper() const
{
- if ( !mpData->mpLocaleDataWrapper )
- ((AllSettings*)this)->mpData->mpLocaleDataWrapper = new
LocaleDataWrapper( vcl::unohelper::GetMultiServiceFactory(), GetLocale() );
- return *mpData->mpLocaleDataWrapper;
+ if ( !mpData->mpLocaleDataWrapper )
+ ((AllSettings*)this)->mpData->mpLocaleDataWrapper = new
LocaleDataWrapper( vcl::unohelper::GetMultiServiceFactory(), GetLocale() );
+ return *mpData->mpLocaleDataWrapper;
}
// -----------------------------------------------------------------------
const LocaleDataWrapper& AllSettings::GetUILocaleDataWrapper() const
{
- if ( !mpData->mpUILocaleDataWrapper )
- ((AllSettings*)this)->mpData->mpUILocaleDataWrapper = new
LocaleDataWrapper( vcl::unohelper::GetMultiServiceFactory(), GetUILocale() );
- return *mpData->mpUILocaleDataWrapper;
+ if ( !mpData->mpUILocaleDataWrapper )
+ ((AllSettings*)this)->mpData->mpUILocaleDataWrapper = new
LocaleDataWrapper( vcl::unohelper::GetMultiServiceFactory(), GetUILocale() );
+ return *mpData->mpUILocaleDataWrapper;
}
// -----------------------------------------------------------------------
const vcl::I18nHelper& AllSettings::GetLocaleI18nHelper() const
{
- if ( !mpData->mpI18nHelper ) {
-
::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
aFactory(vcl::unohelper::GetMultiServiceFactory());
- ((AllSettings*)this)->mpData->mpI18nHelper = new vcl::I18nHelper(
aFactory, GetLocale() );
- }
- return *mpData->mpI18nHelper;
+ if ( !mpData->mpI18nHelper ) {
+
::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
aFactory(vcl::unohelper::GetMultiServiceFactory());
+ ((AllSettings*)this)->mpData->mpI18nHelper = new
vcl::I18nHelper( aFactory, GetLocale() );
+ }
+ return *mpData->mpI18nHelper;
}
// -----------------------------------------------------------------------
const vcl::I18nHelper& AllSettings::GetUILocaleI18nHelper() const
{
- if ( !mpData->mpUII18nHelper ) {
-
::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
aFactory(vcl::unohelper::GetMultiServiceFactory());
- ((AllSettings*)this)->mpData->mpUII18nHelper = new vcl::I18nHelper(
aFactory, GetUILocale() );
- }
- return *mpData->mpUII18nHelper;
+ if ( !mpData->mpUII18nHelper ) {
+
::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
aFactory(vcl::unohelper::GetMultiServiceFactory());
+ ((AllSettings*)this)->mpData->mpUII18nHelper = new
vcl::I18nHelper( aFactory, GetUILocale() );
+ }
+ return *mpData->mpUII18nHelper;
}
-
// -----------------------------------------------------------------------
/*
const CollatorWrapper& AllSettings::GetCollatorWrapper() const
{
- if ( !mpData->mpCollatorWrapper )
- {
- ((AllSettings*)this)->mpData->mpCollatorWrapper = new CollatorWrapper(
vcl::unohelper::GetMultiServiceFactory() );
- ((AllSettings*)this)->mpData->mpCollatorWrapper->loadDefaultCollator(
GetLocale(), 0 );
- }
- return *mpData->mpCollatorWrapper;
+ if ( !mpData->mpCollatorWrapper )
+ {
+ ((AllSettings*)this)->mpData->mpCollatorWrapper = new
CollatorWrapper( vcl::unohelper::GetMultiServiceFactory() );
+
((AllSettings*)this)->mpData->mpCollatorWrapper->loadDefaultCollator(
GetLocale(), 0 );
+ }
+ return *mpData->mpCollatorWrapper;
}
*/
// -----------------------------------------------------------------------
/*
const CollatorWrapper& AllSettings::GetUICollatorWrapper() const
{
- if ( !mpData->mpUICollatorWrapper )
- {
- ((AllSettings*)this)->mpData->mpUICollatorWrapper = new
CollatorWrapper( vcl::unohelper::GetMultiServiceFactory() );
-
((AllSettings*)this)->mpData->mpUICollatorWrapper->loadDefaultCollator(
GetUILocale(), 0 );
- }
- return *mpData->mpUICollatorWrapper;
+ if ( !mpData->mpUICollatorWrapper )
+ {
+ ((AllSettings*)this)->mpData->mpUICollatorWrapper = new
CollatorWrapper( vcl::unohelper::GetMultiServiceFactory() );
+
((AllSettings*)this)->mpData->mpUICollatorWrapper->loadDefaultCollator(
GetUILocale(), 0 );
+ }
+ return *mpData->mpUICollatorWrapper;
}
*/
@@ -2050,3 +2047,5 @@ void AllSettings::LocaleSettingsChanged( sal_uInt32 nHint
)
Application::SetSettings( aAllSettings );
}
+
+/* vim: set noet sw=4 ts=4: */
