diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
tree | 1f335918a854319df9269329d165a91d711d2108 /svtools | |
parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) |
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
In this stage we focus on replacing usage of the WIN macro
Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/control/inettbc.cxx | 4 | ||||
-rw-r--r-- | svtools/source/dialogs/insdlg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/imagemgr.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 6 | ||||
-rw-r--r-- | svtools/source/uno/fpicker.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index f86a8f17933e..ad7162407709 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -494,7 +494,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR INetURLObject aObj( aBaseURL ); // HRO: I suppose this hack should only be done for Windows !!!??? -#ifdef WNT +#ifdef _WIN32 // HRO: INetURLObject::smatRel2Abs does not recognize '\\' as a relative path // but in case of "\\\\" INetURLObject is right - this is an absolute path ! @@ -1184,7 +1184,7 @@ OUString SvtURLBox::GetURL() return *j; } -#ifdef WNT +#ifdef _WIN32 // erase trailing spaces on Windows since thay are invalid on this OS and // most of the time they are inserted by accident via copy / paste aText = comphelper::string::stripEnd(aText, ' '); diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 877c7eadaa0b..6033a74f03db 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -172,7 +172,7 @@ void SvObjectServerList::FillInsertObjects() } -#ifdef WNT +#ifdef _WIN32 SvGlobalName aOleFact( SO3_OUT_CLASSID ); OUString aOleObj( SVT_RESSTR( STR_FURTHER_OBJECT ) ); aObjectServerList.push_back( SvObjectServer( aOleFact, aOleObj ) ); diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 58ce528e57db..07b02bbb9ef8 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -89,7 +89,7 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] = { "jpeg", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG }, { "jpg", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG }, { "lha", true, STR_DESCRIPTION_ARCHIVFILE, 0 }, -#ifdef WNT +#ifdef _WIN32 { "lnk", false, 0, 0 }, #endif { "log", true, STR_DESCRIPTION_LOGFILE, 0 }, diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 72e4b52554ac..dc79ac671c7b 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef WNT +#ifdef _WIN32 #include <prewin.h> #include <postwin.h> #include <shlobj.h> @@ -807,7 +807,7 @@ bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, } break; -#ifdef WNT +#ifdef _WIN32 case SotClipboardFormatId::FILEGRPDESCRIPTOR: { Sequence< sal_Int8 > aSeq( sizeof( FILEGROUPDESCRIPTOR ) ); @@ -1879,7 +1879,7 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo } break; -#ifdef WNT +#ifdef _WIN32 case SotClipboardFormatId::FILEGRPDESCRIPTOR: { Sequence<sal_Int8> aSeq = GetSequence(rFlavor, OUString()); diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx index aa650f5675f4..cab3e3a95db1 100644 --- a/svtools/source/uno/fpicker.cxx +++ b/svtools/source/uno/fpicker.cxx @@ -50,7 +50,7 @@ static OUString FilePicker_getSystemPickerServiceName() else return OUString ("com.sun.star.ui.dialogs.SystemFilePicker"); #endif -#ifdef WNT +#ifdef _WIN32 return OUString ("com.sun.star.ui.dialogs.Win32FilePicker"); #endif } |