[Libreoffice-commits] .: basic/source cui/source editeng/source linguistic/source sc/source sd/source sfx2/source svtools/source svx/source sw/source unotools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 1 13:44:31 PST 2013
basic/source/comp/loops.cxx | 8 --------
basic/source/comp/token.cxx | 10 ----------
basic/source/sbx/sbxscan.cxx | 9 ---------
cui/source/tabpages/tpbitmap.cxx | 8 --------
editeng/source/items/frmitems.cxx | 8 --------
linguistic/source/dlistimp.cxx | 5 -----
sc/source/core/data/column.cxx | 14 --------------
sc/source/core/data/documen5.cxx | 5 -----
sc/source/core/data/pivot2.cxx | 5 -----
sc/source/core/data/table4.cxx | 5 -----
sc/source/core/tool/chartarr.cxx | 8 --------
sc/source/filter/lotus/tool.cxx | 4 ----
sc/source/ui/docshell/tablink.cxx | 6 ------
sc/source/ui/drawfunc/fuins1.cxx | 4 ----
sc/source/ui/drawfunc/fusel.cxx | 9 ---------
sc/source/ui/view/cellsh4.cxx | 4 ----
sc/source/ui/view/dbfunc2.cxx | 8 --------
sc/source/ui/view/dbfunc4.cxx | 4 ----
sc/source/ui/view/drawvie4.cxx | 15 ---------------
sc/source/ui/view/drawview.cxx | 9 ---------
sc/source/ui/view/tabview3.cxx | 8 --------
sc/source/ui/view/tabvwsh2.cxx | 4 ----
sc/source/ui/view/tabvwshb.cxx | 4 ----
sc/source/ui/view/tabvwshd.cxx | 4 ----
sd/source/ui/func/fuinsert.cxx | 8 --------
sd/source/ui/view/drviews4.cxx | 11 -----------
sd/source/ui/view/drviewse.cxx | 8 --------
sd/source/ui/view/sdview4.cxx | 9 ---------
sd/source/ui/view/viewshe2.cxx | 8 --------
sfx2/source/control/ctrlitem.cxx | 6 ------
sfx2/source/view/viewprn.cxx | 13 -------------
svtools/source/brwbox/brwbox2.cxx | 15 ---------------
svtools/source/dialogs/filedlg2.cxx | 4 ----
svtools/source/filter/ixpm/xpmread.cxx | 8 --------
svx/source/svdraw/svdopath.cxx | 5 -----
svx/source/xoutdev/_xoutbmp.cxx | 8 --------
sw/source/core/layout/layact.cxx | 2 --
sw/source/core/txtnode/fntcache.cxx | 14 --------------
sw/source/core/txtnode/fntcap.cxx | 11 -----------
unotools/source/i18n/textsearch.cxx | 11 -----------
40 files changed, 309 deletions(-)
New commits:
commit 59074c09b838ebaf63f5d3e7578bb473080ec0ee
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Tue Jan 1 22:39:15 2013 +0100
remove use of #pragma optimize
All these are years old, guessing from some comments as old
as Windows 9x support. These workarounds do not seem to be needed now.
Change-Id: If67baa5cdefcec33b28696c764b1ed96143b7ccd
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index ac53648..127ec88 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -451,10 +451,6 @@ done:
// ON Error/Variable
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
void SbiParser::On()
{
SbiToken eTok = Peek();
@@ -519,10 +515,6 @@ void SbiParser::On()
}
}
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
// RESUME [0]|NEXT|label
void SbiParser::Resume()
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index ca62163..e0dc9fd 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -533,11 +533,6 @@ special:
return eCurTok;
}
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
-
bool SbiTokenizer::MayBeLabel( bool bNeedsColon )
{
if( eCurTok == SYMBOL || m_aTokenLabelInfo.canTokenBeLabel( eCurTok ) )
@@ -552,9 +547,4 @@ bool SbiTokenizer::MayBeLabel( bool bNeedsColon )
}
}
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index f9a328e..4f080dd 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -370,11 +370,6 @@ static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth,
// This routine is public because it's also used by the Put-functions
// in the class SbxImpSTRING.
-#ifdef _MSC_VER
-#pragma optimize( "", off )
-#pragma warning(disable: 4748) // "... because optimizations are disabled ..."
-#endif
-
void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, bool bCoreString )
{
char *q;
@@ -402,10 +397,6 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, bool bCoreStrin
rRes = ::rtl::OUString::createFromAscii( cBuf );
}
-#ifdef _MSC_VER
-#pragma optimize( "", on )
-#endif
-
bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
{
bool bChanged = false;
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 1c7b87a..0510868 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -679,10 +679,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
//------------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
{
ResMgr& rMgr = CUI_MGR();
@@ -777,10 +773,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
return 0L;
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
//------------------------------------------------------------------------
IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 8360c7a..3377cb9 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3309,10 +3309,6 @@ void SvxLineItem::SetLine( const SvxBorderLine* pNew )
pLine = pNew ? new SvxBorderLine( *pNew ) : 0;
}
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
// class SvxBrushItem ----------------------------------------------------
#define LOAD_GRAPHIC ((sal_uInt16)0x0001)
@@ -4139,10 +4135,6 @@ SvxBrushItem::SvxBrushItem( const CntWallpaperItem& rItem, sal_uInt16 _nWhich )
}
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
void SvxBrushItem::ApplyGraphicTransparency_Impl()
{
DBG_ASSERT(pImpl->pGraphicObject, "no GraphicObject available" );
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index ed7a8a7..2c83a24 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -870,11 +870,6 @@ static void AddUserData( const uno::Reference< XDictionary > &rDic )
}
}
-
-#if defined _MSC_VER
-#pragma optimize("g",off)
-#endif
-
static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bool& bNeg )
{
if (rFileURL.Len() == 0)
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index d40e359..aefe043 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -37,10 +37,6 @@
#include "detfunc.hxx" // for Notes in Sort/Swap
#include "postit.hxx"
-//#pragma optimize ( "", off )
-// nur Search ohne Optimierung!
-
-// STATIC DATA -----------------------------------------------------------
using ::editeng::SvxBorderLine;
using namespace formula;
@@ -668,11 +664,6 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr )
// alte Version mit SfxItemPoolCache:
}
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
-
bool ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
{
if ( maItems.empty() )
@@ -761,11 +752,6 @@ bool ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
return bFound;
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
-
ScBaseCell* ScColumn::GetCell( SCROW nRow ) const
{
SCSIZE nIndex;
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 678a22d..c4ca715 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -26,11 +26,6 @@
#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
#include <sfx2/objsh.hxx>
#include <svx/svditer.hxx>
#include <svx/svdoole2.hxx>
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index a5e23d0..eedf727 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
#include "scitems.hxx"
#include <editeng/boxitem.hxx>
#include <editeng/wghtitem.hxx>
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index f5655f3..00aa1c3 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma optimize("",off)
- // sonst Absturz Win beim Fuellen
-#endif
-
#include "scitems.hxx"
#include <comphelper/string.hxx>
#include <svx/algitem.hxx>
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index fff0fc3..677319b 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -96,10 +96,6 @@ bool ScChartArray::operator==(const ScChartArray& rCmp) const
&& aName == rCmp.aName;
}
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
ScMemChart* ScChartArray::CreateMemChart()
{
ScRangeListRef aRangeListRef(GetRangeList());
@@ -485,10 +481,6 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
return pMemChart;
}
-#ifdef _MSC_VER
-#pragma optimize("",on)
-#endif
-
ScChartCollection::ScChartCollection() {}
ScChartCollection::ScChartCollection(const ScChartCollection& r) :
maData(r.maData) {}
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 8b81a58..4fa8eb1 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -36,10 +36,6 @@
#include <math.h>
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
//--------------------------------------------------------- EXTERNE VARIABLEN -
extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp
extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index b7d3a54..f42810f 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -17,12 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
-//------------------------------------------------------------------
-
#include <sfx2/sfxsids.hrc>
#include <sfx2/app.hxx>
#include <svl/itemset.hxx>
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 4915e69..a5d6199 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -202,10 +202,6 @@ static void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi,
|*
\************************************************************************/
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
-
FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
Window* pWin,
ScDrawView* pViewP,
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index c69d61d..4968f15 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -56,10 +56,6 @@
// -----------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
using namespace com::sun::star;
/*************************************************************************
@@ -636,9 +632,4 @@ void FuSelection::Deactivate()
FuDraw::Deactivate();
}
-
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 59d8724..945909c 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma optimize ("", off)
-#endif
-
#include <sfx2/request.hxx>
#include "cellsh.hxx"
diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx
index 5a8952c..20cfc64 100644
--- a/sc/source/ui/view/dbfunc2.cxx
+++ b/sc/source/ui/view/dbfunc2.cxx
@@ -24,14 +24,6 @@
#include "sc.hrc"
#include "globstr.hrc"
-
-// STATIC DATA -----------------------------------------------------------
-
-
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
//==================================================================
void ScDBFunc::UpdateCharts( sal_Bool bAllCharts )
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index f394612..447d487 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -27,10 +27,6 @@
// -----------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
using namespace com::sun::star;
//==================================================================
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 5283781..234fbbc 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -50,14 +50,6 @@ Point aDragStartDiff;
// -----------------------------------------------------------------------
-//! welche Funktionen aus drawview/drawvie4 muessen wirklich ohne Optimierung sein?
-
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
-// -----------------------------------------------------------------------
-
void ScDrawView::CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle )
{
rAnyOle = rOneOle = false;
@@ -333,11 +325,4 @@ void ScDrawView::SetMarkedOriginalSize()
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 2c13e34..48a5504 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -62,11 +62,6 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
-
void ScDrawView::Construct()
{
EnableExtendedKeyInputDispatcher(false);
@@ -571,10 +566,6 @@ void ScDrawView::UpdateUserViewOptions()
}
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
sal_Bool ScDrawView::SelectObject( const String& rName )
{
UnmarkAll();
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 8fcf73e..053d3a8 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -254,10 +254,6 @@ void ScTabView::InvalidateAttribs()
// oder Referenz verschicken
// ohne Optimierung wegen BugId 29307
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool bNew )
{
SCCOL nOldX = aViewData.GetCurX();
@@ -285,10 +281,6 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool bNew )
}
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
void ScTabView::CheckSelectionTransfer()
{
if ( aViewData.IsActive() ) // only for active view
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 2ed2c21..8d137a8 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma optimize ("", off)
-#endif
-
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
#include <svl/aeitem.hxx>
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 89b3aef..2765f71 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -20,10 +20,6 @@
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
-#ifdef _MSC_VER
-#pragma optimize ("", off)
-#endif
-
#include <com/sun/star/embed/EmbedMisc.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
#include <sfx2/app.hxx>
diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx
index 2399b08..77dcfcc 100644
--- a/sc/source/ui/view/tabvwshd.cxx
+++ b/sc/source/ui/view/tabvwshd.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma optimize ("", off)
-#endif
-
#include <sfx2/childwin.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index fd72ccc..1ea0167 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -112,10 +112,6 @@ FunctionReference FuInsertGraphic::Create( ViewShell* pViewSh, ::sd::Window* pWi
return xFunc;
}
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
void FuInsertGraphic::DoExecute( SfxRequest& )
{
SvxOpenGraphicDialog aDlg(SdResId(STR_INSERTGRAPHIC));
@@ -164,10 +160,6 @@ void FuInsertGraphic::DoExecute( SfxRequest& )
}
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
/*************************************************************************
|*
|* FuInsertClipboard::Konstruktor
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index cdfb31c..fe92bc0 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -68,10 +68,6 @@ namespace sd {
#define PIPETTE_RANGE 0
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing;
@@ -963,13 +959,6 @@ void DrawViewShell::ShowSnapLineContextMenu (
}
}
-
-
-
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
} // end of namespace sd
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 5d4cad6..e17192c 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -101,10 +101,6 @@ using namespace ::com::sun::star::presentation;
namespace sd {
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
/*************************************************************************
|*
|* Permanente Funktionen
@@ -1685,10 +1681,6 @@ void DrawViewShell::StopSlideShow (bool /*bCloseFrame*/)
}
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
} // end of namespace sd
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 7778cd7..2dad995 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -64,10 +64,6 @@ using namespace com::sun::star;
namespace sd {
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
/*************************************************************************
|*
|* Graphik einfuegen
@@ -567,11 +563,6 @@ IMPL_LINK_NOARG(View, DropErrorHdl)
return 0;
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
-
/*************************************************************************
|*
|* StyleSheet aus der Sleketion besorgen
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 668d748..e4b65e0 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -70,10 +70,6 @@
#include <svtools/soerr.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
using namespace com::sun::star;
#ifndef DISABLE_DYNLOADING // otherwise use the one in sw...
@@ -1092,10 +1088,6 @@ sal_Int8 ViewShell::ExecuteDrop (
return( pView ? pView->ExecuteDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE );
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence <
::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse)
{
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 3a916c4..317c16a 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -353,10 +353,4 @@ SfxItemState SfxControllerItem::GetItemState
: SFX_ITEM_AVAILABLE;
}
-//------------------------------------------------------------------------
-
-#ifdef _MSC_VER
-#pragma optimize("g",off)
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index a001557..2b2f119 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -577,14 +577,6 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
return pDocPrinter;
}
-//-------------------------------------------------------------------------
-// Sadly enough the problem arises with WIN32 that nothing is printed when
-// SID_PRINTDOCDIRECT auflaueft. At the moment the only known solution in this
-// case is to turn off the optimazation.
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rProps, sal_Bool bIsAPI, sal_Bool bIsDirect )
{
// get the current selection; our controller should know it
@@ -890,11 +882,6 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
}
}
-// Turn on optimazation again.
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
//--------------------------------------------------------------------
SfxPrinter* SfxViewShell::GetPrinter( sal_Bool /*bCreate*/ )
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index ccbac54..fd027fc 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -304,10 +304,6 @@ void BrowseBox::EndScroll()
//-------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma optimize( "", off )
-#endif
-
void BrowseBox::ToggleSelection( sal_Bool bForce )
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
@@ -381,10 +377,6 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
bNotToggleSel = sal_False;
}
-#ifdef _MSC_VER
-#pragma optimize( "", on )
-#endif
-
//-------------------------------------------------------------------
void BrowseBox::DrawCursor()
@@ -1457,9 +1449,6 @@ IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar )
//-------------------------------------------------------------------
// usually only the first column was resized
-#ifdef _MSC_VER
-#pragma optimize("",off)
-#endif
void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
{
@@ -1515,10 +1504,6 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
SetNoSelection();
}
-#ifdef _MSC_VER
-#pragma optimize("",on)
-#endif
-
//-------------------------------------------------------------------
void BrowseBox::MouseMove( const MouseEvent& rEvt )
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index d4a70e2..bc197bb 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -32,10 +32,6 @@
#include <svtools/stdctrl.hxx>
-#ifdef _MSC_VER
-#pragma optimize ("", off)
-#endif
-
#include <svtools/helpid.hrc>
using namespace com::sun::star;
diff --git a/svtools/source/filter/ixpm/xpmread.cxx b/svtools/source/filter/ixpm/xpmread.cxx
index e15bf33..0317736 100644
--- a/svtools/source/filter/ixpm/xpmread.cxx
+++ b/svtools/source/filter/ixpm/xpmread.cxx
@@ -59,10 +59,6 @@ XPMReader::~XPMReader()
// ------------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma optimize ("",off)
-#endif
-
ReadState XPMReader::ReadXPM( Graphic& rGraphic )
{
ReadState eReadState;
@@ -218,10 +214,6 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
return eReadState;
}
-#ifdef _MSC_VER
-#pragma optimize ("",on)
-#endif
-
// ------------------------------------------------------------------------
// ImplGetColor ermittelt saemtliche Farbwerte,
// die Rueckgabe ist sal_True wenn saemtliche Farben zugeordnet werden konnten
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 1ba1973..96e8abe 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -35,11 +35,6 @@
#include "svx/svdglob.hxx" // Stringcache
#include "svx/svdstr.hrc" // the object's name
-#ifdef _MSC_VER
-#pragma optimize ("",off)
-#pragma warning(disable: 4748) // "... because optimizations are disabled ..."
-#endif
-
#include <svx/xlnwtit.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xflclit.hxx>
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 22bad4a..a57f6fa 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -299,10 +299,6 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
// ------------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma optimize ( "", off )
-#endif
-
sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
GraphicFilter& rFilter, const sal_uInt16 nFormat,
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
@@ -329,10 +325,6 @@ sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObje
return nRet;
}
-#ifdef _MSC_VER
-#pragma optimize ( "", on )
-#endif
-
// ------------------------------------------------------------------------
Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 249f951..26b3523 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -80,8 +80,6 @@
#include <PostItMgr.hxx>
#include <vector>
-//#pragma optimize("ity",on)
-
/*************************************************************************
|*
|* SwLayAction static stuff
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index c6c6745..fe189ab 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -653,14 +653,6 @@ static bool lcl_IsMonoSpaceFont( const OutputDevice& rOut )
return nWidth1 == nWidth2;
}
-// ER 09.07.95 20:34
-// mit -Ox Optimierung stuerzt's unter win95 ab
-// JP 12.07.95: unter WNT auch (i386); Alpha ??
-// global optimization off
-#ifdef _MSC_VER
-#pragma optimize("g",off)
-#endif
-
/* This helper structure (SwForbidden) contains the already marked parts of the string
to avoid double lines (e.g grammar + spell check error) */
@@ -1775,12 +1767,6 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
}
-// optimization disabled for DrawText()
-#ifdef _MSC_VER
-#pragma optimize("",on)
-#endif
-
-
/*************************************************************************
*
* Size SwFntObj::GetTextSize( const OutputDevice *pOut, const String &rTxt,
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index e77acb0..ef40571 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -541,11 +541,6 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo &rInf )
* SwSubFont::DoOnCapitals() const
*************************************************************************/
-// JP 22.8.2001 - global optimization off - Bug 91245 / 91223
-#ifdef _MSC_VER
-#pragma optimize("g",off)
-#endif
-
void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
{
OSL_ENSURE( pLastFont, "SwFont::DoOnCapitals: No LastFont?!" );
@@ -836,10 +831,4 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
rDo.GetInf().SetKanaDiff( nKana );
}
-// JP 22.8.2001 - global optimization off - Bug 91245 / 91223
-#ifdef _MSC_VER
-#pragma optimize("g",on)
-#endif
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 770b529..9105150 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -206,11 +206,6 @@ TextSearch::~TextSearch()
* methods, such as ordinary string searching or regular expression
* matching, using the method pointer.
*/
-#if defined _MSC_VER
-#pragma optimize("", off)
-#pragma warning(push)
-#pragma warning(disable: 4748)
-#endif
int TextSearch::SearchFrwrd( const String & rStr, xub_StrLen* pStart,
xub_StrLen* pEnde, SearchResult* pRes )
{
@@ -406,12 +401,6 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr,
}
}
-
-#if defined _MSC_VER
-#pragma optimize("", on)
-#pragma warning(pop)
-#endif
-
// ............................................................................
} // namespace utl
// ............................................................................
More information about the Libreoffice-commits
mailing list