diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:22:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 10:20:05 -0600 |
commit | 75bbbf964b7976cc02d5ba054760bf93cb2e76c9 (patch) | |
tree | a20660b861414f454d9ae8ff7b554bc1667e3bdb /dtrans/source/win32/misc | |
parent | 5faf5492741abfd013ae677b1ec2fc06276d8644 (diff) |
Remove visual noise from dtrans
Change-Id: Ic460e514ac078a69cd86381b9b5cf779eb97971b
Reviewed-on: https://gerrit.libreoffice.org/8254
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dtrans/source/win32/misc')
-rw-r--r-- | dtrans/source/win32/misc/ImplHelper.cxx | 34 | ||||
-rw-r--r-- | dtrans/source/win32/misc/ImplHelper.hxx | 13 | ||||
-rw-r--r-- | dtrans/source/win32/misc/WinClip.hxx | 1 |
3 files changed, 0 insertions, 48 deletions
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index 3b6c75ce010a..e3a5369808c7 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -41,16 +41,11 @@ #define FORMATETC_PARTIAL_MATCH -1 #define FORMATETC_NO_MATCH 0 - // namespace directives - - - // returns a windows codepage appropriate to the // given mime charset parameter value - sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset ) { sal_uInt32 winCP = GetACP( ); @@ -79,11 +74,9 @@ sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset ) return winCP; } - // returns a windows codepage appropriate to the // given locale and locale type - OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype ) { OSL_ASSERT( IsValidLocale( lcid, LCID_SUPPORTED ) ); @@ -129,33 +122,27 @@ OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype ) return winCP; } - // returns a mime charset parameter value appropriate // to the given codepage, optional a prefix can be // given, e.g. "windows-" or "cp" - OUString SAL_CALL getMimeCharsetFromWinCP( sal_uInt32 cp, const OUString& aPrefix ) { return aPrefix + cptostr( cp ); } - // returns a mime charset parameter value appropriate // to the given locale id and locale type, optional a // prefix can be given, e.g. "windows-" or "cp" - OUString SAL_CALL getMimeCharsetFromLocaleId( LCID lcid, LCTYPE lctype, const OUString& aPrefix ) { OUString charset = getWinCPFromLocaleId( lcid, lctype ); return aPrefix + charset; } - // IsOEMCP - sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage ) { OSL_ASSERT( IsValidCodePage( codepage ) ); @@ -172,10 +159,8 @@ sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage ) return sal_False; } - // converts a codepage into its string representation - OUString SAL_CALL cptostr( sal_uInt32 codepage ) { OSL_ASSERT( IsValidCodePage( codepage ) ); @@ -183,7 +168,6 @@ OUString SAL_CALL cptostr( sal_uInt32 codepage ) return OUString::number( static_cast<sal_Int64>( codepage ) ); } - // OleStdDeleteTargetDevice() // // Purpose: @@ -192,8 +176,6 @@ OUString SAL_CALL cptostr( sal_uInt32 codepage ) // // Return Value: // SCODE - S_OK if successful - - void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd ) { #if defined ( __MINGW32__ ) && !defined ( _WIN64 ) @@ -221,9 +203,6 @@ void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd ) #endif } - - - // OleStdCopyTargetDevice() // // Purpose: @@ -239,8 +218,6 @@ void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd ) // pointer to allocated copy of ptdSrc // if ptdSrc==NULL then retuns NULL is returned. // if ptdSrc!=NULL and memory allocation fails, then NULL is returned - - DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc ) { DVTARGETDEVICE* ptdDest = NULL; @@ -272,8 +249,6 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc ) return ptdDest; } - - // OleStdCopyFormatEtc() // // Purpose: @@ -297,8 +272,6 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc ) // returns TRUE if copy was successful; // retuns FALSE if not successful, e.g. one or both of the pointers // were invalid or the pointers were equal - - sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc ) { sal_Bool bRet = sal_False; @@ -344,14 +317,12 @@ sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc ) return bRet; } - // returns: // 1 for exact match, // 0 for no match, // -1 for partial match (which is defined to mean the left is a subset // of the right: fewer aspects, null target device, fewer medium). - sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC* pFetcRhs ) { sal_Int32 nMatch = FORMATETC_EXACT_MATCH; @@ -419,11 +390,6 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC* return nMatch; } - - -// - - sal_Bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE* ptdRight ) { sal_Bool bRet = sal_False; diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx index 10fb2593cc54..de50bd8f94ff 100644 --- a/dtrans/source/win32/misc/ImplHelper.hxx +++ b/dtrans/source/win32/misc/ImplHelper.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef _IMPLHELPER_HXX_ #define _IMPLHELPER_HXX_ @@ -41,49 +40,37 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice(DVTARGETDEVICE* ptdSrc); // some codepage helper functions -//-------------------------------------------------- // returns a windows codepage appropriate to the // given mime charset parameter value -//-------------------------------------------------- sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset ); -//-------------------------------------------------- // returns a windows codepage appropriate to the // given locale and locale type -//-------------------------------------------------- OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype ); -//-------------------------------------------------- // returns a mime charset parameter value appropriate // to the given codepage, optional a prefix can be // given, e.g. "windows-" or "cp" -//-------------------------------------------------- OUString SAL_CALL getMimeCharsetFromWinCP( sal_uInt32 cp, const OUString& aPrefix ); -//-------------------------------------------------- // returns a mime charset parameter value appropriate // to the given locale id and locale type, optional a // prefix can be given, e.g. "windows-" or "cp" -//-------------------------------------------------- OUString SAL_CALL getMimeCharsetFromLocaleId( LCID lcid, LCTYPE lctype, const OUString& aPrefix ); -//----------------------------------------------------- // returns true, if a given codepage is an oem codepage -//----------------------------------------------------- sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage ); -//-------------------------------------------------- // converts a codepage into a string representation -//-------------------------------------------------- OUString SAL_CALL cptostr( sal_uInt32 codepage ); diff --git a/dtrans/source/win32/misc/WinClip.hxx b/dtrans/source/win32/misc/WinClip.hxx index d447922c928a..5689a7bf294d 100644 --- a/dtrans/source/win32/misc/WinClip.hxx +++ b/dtrans/source/win32/misc/WinClip.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef _WINCLIP_HXX_ #define _WINCLIP_HXX_ |