[Libreoffice-commits] .: extensions/source hwpfilter/source sw/source vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 27 04:10:20 PST 2012
extensions/source/scanner/scanwin.cxx | 4 ++--
hwpfilter/source/hcode.cxx | 2 +-
sw/source/ui/config/mailconfigpage.cxx | 12 ++++++------
sw/source/ui/dbui/addresslistdialog.cxx | 4 ++--
sw/source/ui/dbui/createaddresslistdialog.cxx | 12 ++++++------
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 8 ++++----
sw/source/ui/dbui/dbtablepreviewdialog.cxx | 4 ++--
sw/source/ui/dbui/mailmergechildwindow.cxx | 4 ++--
sw/source/ui/dbui/mmaddressblockpage.cxx | 20 ++++++++++----------
sw/source/ui/dbui/mmdocselectpage.cxx | 4 ++--
sw/source/ui/dbui/mmgreetingspage.cxx | 8 ++++----
sw/source/ui/dbui/mmlayoutpage.cxx | 4 ++--
sw/source/ui/dbui/mmmergepage.cxx | 4 ++--
sw/source/ui/dbui/mmoutputpage.cxx | 8 ++++----
sw/source/ui/dbui/mmoutputtypepage.cxx | 4 ++--
sw/source/ui/dbui/mmpreparemergepage.cxx | 4 ++--
sw/source/ui/dbui/selectdbtabledialog.cxx | 4 ++--
vcl/inc/graphite_serverfont.hxx | 2 +-
vcl/source/gdi/sallayout.cxx | 2 +-
19 files changed, 57 insertions(+), 57 deletions(-)
New commits:
commit 09b08d4adb758b8766f22f2bac9a1fa2d94f6b53
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Dec 27 14:09:50 2012 +0200
More MSC -> _MSC_VER, sorry
Change-Id: Ie5070d514c1f4dd9f9708253eb44134baec6524a
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 5a8f242..020ad5a 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -41,12 +41,12 @@
#include <vcl/sysdata.hxx>
#include "scanner.hxx"
-#if defined MSC
+#if defined _MSC_VER
#pragma warning (push,1)
#pragma warning (disable:4668)
#endif
#include "twain/twain.h"
-#if defined MSC
+#if defined _MSC_VER
#pragma warning (pop)
#endif
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index bda6243..1187e42 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#if defined WIN32 && defined MSC
+#ifdef _MSC_VER
#include <float.h>
#define isnan _isnan
#endif
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 7553688..8dc428e 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -127,7 +127,7 @@ public:
SwMailConfigPage::SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, SW_RES(TP_MAILCONFIG), rSet),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aIdentityFL( this, SW_RES( FL_IDENTITY)),
@@ -147,7 +147,7 @@ SwMailConfigPage::SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ) :
m_aServerAuthenticationPB( this, SW_RES( PB_AUTHENTICATION )),
m_aSeparatorFL( this, SW_RES( FL_SEPARATOR )),
m_aTestPB( this, SW_RES( PB_TEST)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_pConfigItem( new SwMailMergeConfigItem )
@@ -236,7 +236,7 @@ IMPL_LINK_NOARG(SwMailConfigPage, TestHdl)
SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent) :
SfxModalDialog(pParent, SW_RES(DLG_MM_TESTACCOUNTSETTINGS)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aInfoFI( this, SW_RES( FI_INFO )),
@@ -248,7 +248,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare
m_aStopPB( this, SW_RES( PB_STOP )),
m_aCancelPB( this, SW_RES( PB_CANCEL )),
m_aHelpPB( this, SW_RES( PB_HELP )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_aImageList( SW_RES(ILIST) ),
@@ -444,7 +444,7 @@ SwMailConfigDlg::~SwMailConfigDlg()
SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem) :
SfxModalDialog(pParent, SW_RES(DLG_MM_SERVERAUTHENTICATION)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aAuthenticationCB( this, SW_RES( CB_AUTHENTICATION )),
@@ -471,7 +471,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
m_aOKPB( this, SW_RES( PB_OK )),
m_aCancelPB( this, SW_RES( PB_CANCEL )),
m_aHelpPB( this, SW_RES( PB_HELP )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
rConfigItem( rItem )
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index b8126c7..eae8e68 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -141,7 +141,7 @@ static ::rtl::OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSou
SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
SfxModalDialog(pParent, SW_RES(DLG_MM_ADDRESSLISTDIALOG)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aDescriptionFI( this, SW_RES( FI_DESCRIPTION )),
@@ -157,7 +157,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
m_aOK( this, SW_RES( PB_OK )),
m_aCancel( this, SW_RES( PB_CANCEL )),
m_aHelp( this, SW_RES( PB_HELP )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_sName( SW_RES( ST_NAME )),
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 494c723..b622a1f 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -85,12 +85,12 @@ public:
SwAddressControl_Impl::SwAddressControl_Impl(Window* pParent, const ResId& rResId ) :
Control(pParent, rResId),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aScrollBar(this, ResId(SCR_1,*rResId.GetResMgr())),
m_aWindow(this, ResId(WIN_DATA,*rResId.GetResMgr())),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_pData(0),
@@ -339,7 +339,7 @@ long SwAddressControl_Impl::PreNotify( NotifyEvent& rNEvt )
SwCreateAddressListDialog::SwCreateAddressListDialog(
Window* pParent, const String& rURL, SwMailMergeConfigItem& rConfig) :
SfxModalDialog(pParent, SW_RES(DLG_MM_CREATEADDRESSLIST)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aAddressInformation( this, SW_RES( FI_ADDRESSINFORMATION)),
@@ -361,7 +361,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
m_aOK( this, SW_RES( PB_OK)),
m_aCancel( this, SW_RES( PB_CANCEL)),
m_aHelp( this, SW_RES( PB_HELP)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_sAddressListFilterName( SW_RES( ST_FILTERNAME)),
@@ -707,7 +707,7 @@ void SwCreateAddressListDialog::Find(const String& rSearch, sal_Int32 nColumn)
SwFindEntryDialog::SwFindEntryDialog(SwCreateAddressListDialog* pParent) :
ModelessDialog(pParent, SW_RES(DLG_MM_FIND_ENTRY)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aFindFT( this, SW_RES( FT_FIND )),
@@ -717,7 +717,7 @@ SwFindEntryDialog::SwFindEntryDialog(SwCreateAddressListDialog* pParent) :
m_aFindPB( this, SW_RES( PB_FIND)),
m_aCancel( this, SW_RES( PB_CANCEL)),
m_aHelp( this, SW_RES( PB_HELP)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_pParent(pParent)
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 711731c..8ab066f 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -29,7 +29,7 @@
SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
Window* pParent, const SwCSVData& rOldData) :
SfxModalDialog(pParent, SW_RES(DLG_MM_CUSTOMIZE_ADDRESS_LIST)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aFieldsFT( this, SW_RES( FT_FIELDS)),
@@ -43,7 +43,7 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
m_aOK( this, SW_RES( PB_OK)),
m_aCancel( this, SW_RES( PB_CANCEL)),
m_aHelp( this, SW_RES( PB_HELP)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_pNewData( new SwCSVData(rOldData))
@@ -185,7 +185,7 @@ SwCSVData* SwCustomizeAddressListDialog::GetNewData()
SwAddRenameEntryDialog::SwAddRenameEntryDialog(
Window* pParent, bool bRename, const ::std::vector< ::rtl::OUString >& rCSVHeader) :
SfxModalDialog(pParent, SW_RES(DLG_MM_ADD_RENAME_ENTRY)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aFieldNameFT( this, SW_RES( FT_FIELDNAME)),
@@ -193,7 +193,7 @@ SwAddRenameEntryDialog::SwAddRenameEntryDialog(
m_aOK( this, SW_RES( PB_OK)),
m_aCancel( this, SW_RES( PB_CANCEL)),
m_aHelp( this, SW_RES( PB_HELP)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_rCSVHeader(rCSVHeader)
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index 3bf7c4d..e150f89 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -39,13 +39,13 @@ using namespace ::rtl;
SwDBTablePreviewDialog::SwDBTablePreviewDialog(Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) :
SfxModalDialog(pParent, SW_RES(DLG_MM_DBTABLEPREVIEWDIALOG)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aDescriptionFI( this, SW_RES( FI_DESCRIPTION)),
m_pBeamerWIN( new Window(this, SW_RES( WIN_BEAMER ))),
m_aOK( this, SW_RES( PB_OK ))
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
{
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index b643d9f..eeab99f 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -278,7 +278,7 @@ SwSendWarningBox_Impl::~SwSendWarningBox_Impl()
SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConfigItem) :
ModelessDialog /*SfxModalDialog*/(pParent, SW_RES(DLG_MM_SENDMAILS)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aStatusFL( this, SW_RES( FL_STATUS )),
@@ -294,7 +294,7 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
m_aSeparatorFL( this, SW_RES( FL_SEPARATOR )),
m_aStopPB( this, SW_RES( PB_STOP )),
m_aClosePB( this, SW_RES( PB_CLOSE )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_sMore(m_aDetailsPB.GetText()),
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 8ec670f..d750156 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -54,7 +54,7 @@ static void lcl_Move(Control* pCtrl, long nYOffset)
SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent) :
svt::OWizardPage(_pParent, SW_RES(DLG_MM_ADDRESSBLOCK_PAGE)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aHeaderFI( this, SW_RES( FI_HEADER ) ),
@@ -80,7 +80,7 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pP
m_aDocumentIndexFI( this, SW_RES( FI_DOCINDEX ) ),
m_aPrevSetIB( this, SW_RES( IB_PREVSET ) ),
m_aNextSetIB( this, SW_RES( IB_NEXTSET ) ),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_sDocument( SW_RES( STR_DOCUMENT ) ),
@@ -340,7 +340,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton
SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(
Window* pParent, SwMailMergeConfigItem& rConfig) :
SfxModalDialog(pParent, SW_RES(DLG_MM_SELECTADDRESSBLOCK)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aSelectFT( this, SW_RES( FT_SELECT)),
@@ -357,7 +357,7 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(
m_aOK( this, SW_RES( PB_OK)),
m_aCancel( this, SW_RES( PB_CANCEL)),
m_aHelp( this, SW_RES( PB_HELP)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_rConfig(rConfig)
@@ -543,7 +543,7 @@ void SwRestrictedComboBox::Modify()
SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
Window* pParent, SwMailMergeConfigItem& rConfig, DialogType eType) :
SfxModalDialog(pParent, SW_RES(DLG_MM_CUSTOMIZEADDRESSBLOCK)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aAddressElementsFT( this, SW_RES( FT_ADDRESSELEMENTS )),
@@ -564,7 +564,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
m_aOK( this, SW_RES( PB_OK )),
m_aCancel( this, SW_RES( PB_CANCEL )),
m_aHelp( this, SW_RES( PB_HELP )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_rConfigItem(rConfig),
@@ -965,13 +965,13 @@ public:
SwAssignFieldsControl::SwAssignFieldsControl(
Window* pParent, const ResId& rResId, SwMailMergeConfigItem& rConfigItem) :
Control(pParent, rResId),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aVScroll(this, ResId(SCR_1, *rResId.GetResMgr() )),
m_aHeaderHB(this, WB_BUTTONSTYLE | WB_BOTTOMBORDER),
m_aWindow(this, ResId(WIN_DATA, *rResId.GetResMgr())),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_rConfigItem(rConfigItem),
@@ -1239,7 +1239,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
const ::rtl::OUString& rPreview,
bool bIsAddressBlock) :
SfxModalDialog(pParent, SW_RES(DLG_MM_ASSIGNFIELDS)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aMatchingFI( this, SW_RES( FI_MATCHING)),
@@ -1250,7 +1250,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
m_aOK( this, SW_RES( PB_OK )),
m_aCancel( this, SW_RES( PB_CANCEL )),
m_aHelp( this, SW_RES( PB_HELP )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_sNone(SW_RESSTR(SW_STR_NONE)),
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index a2fd92f..329016c 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -46,7 +46,7 @@ using namespace svt;
SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent ) :
svt::OWizardPage(_pParent, SW_RES(DLG_MM_DOCSELECT_PAGE)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aHeaderFI(this, SW_RES( FI_HEADER ) ),
@@ -59,7 +59,7 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent
m_aBrowseDocPB (this, SW_RES( PB_LOADDOC )),
m_aBrowseTemplatePB (this, SW_RES( PB_BROWSETEMPLATE )),
m_aRecentDocLB (this, SW_RES( LB_RECENTDOC )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_pWizard(_pParent)
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index f4b6232..10b9151 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -230,7 +230,7 @@ void SwGreetingsHandler::Contains(sal_Bool bContainsGreeting)
SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) :
svt::OWizardPage(_pParent, SW_RES(DLG_MM_GREETINGS_PAGE)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aHeaderFI(this, SW_RES( FI_HEADER ) ),
@@ -256,7 +256,7 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent)
m_aPrevSetIB( this, SW_RES( IB_PREVSET ) ),
m_aNextSetIB( this, SW_RES( IB_NEXTSET ) ),
m_sDocument( SW_RES( STR_DOCUMENT ) )
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
{
@@ -436,7 +436,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton)
SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) :
SfxModalDialog(pParent, SW_RES(DLG_MM_MAILBODY)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aGreetingLineCB(this, SW_RES( CB_GREETINGLINE ) ),
@@ -460,7 +460,7 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard)
m_aOK( this, SW_RES( PB_OK ) ),
m_aCancel( this, SW_RES( PB_CANCEL ) ),
m_aHelp( this, SW_RES( PB_HELP ) )
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
{
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 563f5df..03d8ec0 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -74,7 +74,7 @@ using namespace ::com::sun::star::view;
SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
svt::OWizardPage( _pParent, SW_RES(DLG_MM_LAYOUT_PAGE)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aHeaderFI( this, SW_RES( FI_HEADER )),
@@ -93,7 +93,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
m_aExampleWIN( this, 0 ),
m_aZoomFT( this, SW_RES( FT_ZOOM )),
m_aZoomLB( this, SW_RES( LB_ZOOM )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_pExampleFrame(0),
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx
index 97ef45c..647f200 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -31,7 +31,7 @@
SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
svt::OWizardPage(_pParent, SW_RES(DLG_MM_MERGE_PAGE)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aHeaderFI(this, SW_RES( FI_HEADER ) ),
@@ -44,7 +44,7 @@ SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
m_aWholeWordsCB(this, SW_RES( CB_WHOLEWORDS)),
m_aBackwardsCB(this, SW_RES( CB_BACKWARDS )),
m_aMatchCaseCB(this, SW_RES( CB_MATCHCASE )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_pWizard(_pParent)
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 2b51dce..9f18432 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -238,7 +238,7 @@ public:
SwCopyToDialog::SwCopyToDialog(Window* pParent) :
SfxModalDialog(pParent, SW_RES(DLG_MM_COPYTO)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aDescriptionFI( this, SW_RES( FI_DESCRIPTION )),
@@ -251,7 +251,7 @@ SwCopyToDialog::SwCopyToDialog(Window* pParent) :
m_aOK( this, SW_RES( PB_OK )),
m_aCancel( this, SW_RES( PB_CANCEL )),
m_aHelp( this, SW_RES( PB_HELP ))
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
{
@@ -264,7 +264,7 @@ SwCopyToDialog::~SwCopyToDialog()
SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
svt::OWizardPage( _pParent, SW_RES(DLG_MM_OUTPUT_PAGE)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aHeaderFI(this, SW_RES( FI_HEADER ) ),
@@ -316,7 +316,7 @@ SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
m_sNoSubjectST(SW_RES( ST_NOSUBJECT )),
m_sNoAttachmentNameST(SW_RES( ST_NOATTACHMENTNAME )),
m_sConfigureMail(SW_RES( ST_CONFIGUREMAIL)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_bCancelSaving( false ),
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index d9c7017..48d8725 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -27,7 +27,7 @@
SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent) :
svt::OWizardPage( _pParent, SW_RES(DLG_MM_OUTPUTTYPE_PAGE)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aHeaderFI( this, SW_RES( FI_HEADER )),
@@ -36,7 +36,7 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParen
m_aMailRB( this, SW_RES( RB_MAIL )),
m_aHintHeaderFI(this, SW_RES( FI_HINTHEADER)),
m_aHintFI( this, SW_RES( FI_HINT)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_sLetterHintHeader( SW_RES( ST_LETTERHINTHEADER)),
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index ca8ff66..c2f1275 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -41,7 +41,7 @@ using ::rtl::OUString;
SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent) :
svt::OWizardPage( _pParent, SW_RES(DLG_MM_PREPAREMERGE_PAGE)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aHeaderFI(this, SW_RES( FI_HEADER ) ),
@@ -56,7 +56,7 @@ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pP
m_aNoteHeaderFL(this, SW_RES( FL_NOTEHEADER ) ),
m_aEditFI(this, SW_RES( FI_EDIT ) ),
m_aEditPB(this, SW_RES( PB_EDIT ) ),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_pWizard(_pParent)
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index bbcd035..833130c 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans;
SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
const uno::Reference< sdbc::XConnection>& rConnection) :
SfxModalDialog(pParent, SW_RES(DLG_MM_SELECTDBTABLEDDIALOG)),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
m_aSelectFI( this, SW_RES( FI_SELECT )),
@@ -56,7 +56,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
m_aOK( this, SW_RES( PB_OK )),
m_aCancel( this, SW_RES( PB_CANCEL )),
m_aHelp( this, SW_RES( PB_HELP )),
-#ifdef MSC
+#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
m_sName( SW_RES( ST_NAME )),
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index 82dbba8..a0a3890 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -23,7 +23,7 @@
// We need this to enable namespace support in libgrengine headers.
#define GR_NAMESPACE
-#ifndef MSC
+#ifndef _MSC_VER
#include <graphite_layout.hxx>
// Modules
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 140037d..ff56f2c 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -56,7 +56,7 @@
FILE * mslLogFile = NULL;
FILE * mslLog()
{
-#ifdef MSC
+#ifdef _MSC_VER
std::string logFileName(getenv("TEMP"));
logFileName.append("\\msllayout.log");
if (mslLogFile == NULL) mslLogFile = fopen(logFileName.c_str(),"w");
More information about the Libreoffice-commits
mailing list