[Libreoffice-commits] .: 4 commits - basic/workben drawinglayer/source sfx2/inc sfx2/source svx/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 9 12:31:30 PST 2011
basic/workben/basmgr.src | 31
basic/workben/makefile.mk | 78 -
basic/workben/mgrtest.cxx | 590 -------------
drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 456 ----------
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 19
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 9
drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 9
sfx2/inc/sfx2/childwin.hxx | 9
sfx2/inc/sfx2/minstack.hxx | 1
sfx2/inc/sfx2/objsh.hxx | 8
sfx2/source/appl/appbas.cxx | 12
sfx2/source/control/bindings.cxx | 64 -
sfx2/source/doc/objmisc.cxx | 75 -
sfx2/source/view/orgmgr.cxx | 2
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 22
15 files changed, 2 insertions(+), 1383 deletions(-)
New commits:
commit 0b9c9b3d72d4b102a5614853a8f3d093f2320090
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 9 19:49:50 2011 +0100
Remove dead code: This stuff is always false
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index 8a9e73d..6447d78 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -51,15 +51,6 @@
//////////////////////////////////////////////////////////////////////////////
// includes for testing MetafilePrimitive2D::create2DDecomposition
-// this switch defines if the test code is included or not
-#undef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
-
-#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
-#include <vcl/gradient.hxx>
-#include <vcl/pngread.hxx>
-#include <vcl/lineinfo.hxx>
-#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
-
//////////////////////////////////////////////////////////////////////////////
namespace
@@ -217,11 +208,6 @@ namespace drawinglayer
namespace primitive2d
{
Primitive2DSequence GraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D&
-#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
- rViewInformation
-#else
- /*rViewInformation*/
-#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
) const
{
Primitive2DSequence aRetval;
@@ -304,445 +290,6 @@ namespace drawinglayer
case GRAPHIC_GDIMETAFILE :
{
-#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
- static bool bDoTest(false);
-
- if(bDoTest)
- {
- // All this is/was test code for testing MetafilePrimitive2D::create2DDecomposition
- // extensively. It may be needed again when diverse actions need debugging, so i leave
- // it in here, but take it out using USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE.
- // Use it by compiling with the code, insert any DrawObject, convert to Metafile. The
- // debugger will then stop here (when breakpoint set, of course). You may enter single
- // parts of actions and/or change to true what You want to check.
- GDIMetaFile aMtf;
- VirtualDevice aOut;
- const basegfx::B2DRange aRange(getB2DRange(rViewInformation));
- const Rectangle aRectangle(
- basegfx::fround(aRange.getMinX()), basegfx::fround(aRange.getMinY()),
- basegfx::fround(aRange.getMaxX()), basegfx::fround(aRange.getMaxY()));
- const Point aOrigin(aRectangle.TopLeft());
- const Fraction aScaleX(aRectangle.getWidth());
- const Fraction aScaleY(aRectangle.getHeight());
- MapMode aMapMode(MAP_100TH_MM, aOrigin, aScaleX, aScaleY);
-
- Size aDummySize(2, 2);
- aOut.SetOutputSizePixel(aDummySize);
- aOut.EnableOutput(FALSE);
- aOut.SetMapMode(aMapMode);
-
- aMtf.Clear();
- aMtf.Record(&aOut);
-
- const Fraction aNeutralFraction(1, 1);
- const MapMode aRelativeMapMode(
- MAP_RELATIVE,
- Point(-aRectangle.Left(), -aRectangle.Top()),
- aNeutralFraction, aNeutralFraction);
- aOut.SetMapMode(aRelativeMapMode);
-
- if(false)
- {
- const sal_Int32 nHor(aRectangle.getWidth() / 4);
- const sal_Int32 nVer(aRectangle.getHeight() / 4);
- const Rectangle aCenteredRectangle(
- aRectangle.Left() + nHor, aRectangle.Top() + nVer,
- aRectangle.Right() - nHor, aRectangle.Bottom() - nVer);
- aOut.SetClipRegion(aCenteredRectangle);
- }
-
- if(false)
- {
- const Rectangle aRightRectangle(aRectangle.TopCenter(), aRectangle.BottomRight());
- aOut.IntersectClipRegion(aRightRectangle);
- }
-
- if(false)
- {
- const Rectangle aRightRectangle(aRectangle.TopCenter(), aRectangle.BottomRight());
- const Rectangle aBottomRectangle(aRectangle.LeftCenter(), aRectangle.BottomRight());
- Region aRegion(aRightRectangle);
- aRegion.Intersect(aBottomRectangle);
- aOut.IntersectClipRegion(aRegion);
- }
-
- if(false)
- {
- const sal_Int32 nHor(aRectangle.getWidth() / 10);
- const sal_Int32 nVer(aRectangle.getHeight() / 10);
- aOut.MoveClipRegion(nHor, nVer);
- }
-
- if(false)
- {
- Wallpaper aWallpaper(Color(COL_BLACK));
- aOut.DrawWallpaper(aRectangle, aWallpaper);
- }
-
- if(false)
- {
- Wallpaper aWallpaper(Gradient(GRADIENT_LINEAR, Color(COL_RED), Color(COL_GREEN)));
- aOut.DrawWallpaper(aRectangle, aWallpaper);
- }
-
- if(false)
- {
- SvFileStream aRead((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_READ);
- vcl::PNGReader aPNGReader(aRead);
- BitmapEx aBitmapEx(aPNGReader.Read());
- Wallpaper aWallpaper(aBitmapEx);
- aOut.DrawWallpaper(aRectangle, aWallpaper);
- }
-
- if(false)
- {
- const double fHor(aRectangle.getWidth());
- const double fVer(aRectangle.getHeight());
- Color aColor(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0));
-
- for(sal_uInt32 a(0); a < 5000; a++)
- {
- const Point aPoint(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
-
- if(!(a % 3))
- {
- aColor = Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0));
- }
-
- aOut.DrawPixel(aPoint, aColor);
- }
- }
-
- if(false)
- {
- const double fHor(aRectangle.getWidth());
- const double fVer(aRectangle.getHeight());
-
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor();
-
- for(sal_uInt32 a(0); a < 5000; a++)
- {
- const Point aPoint(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
- aOut.DrawPixel(aPoint);
- }
- }
-
- if(false)
- {
- const double fHor(aRectangle.getWidth());
- const double fVer(aRectangle.getHeight());
-
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor();
-
- Point aStart(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
- Point aStop(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
-
- LineInfo aLineInfo(LINE_SOLID, basegfx::fround(fHor / 50.0));
- bool bUseLineInfo(false);
-
- for(sal_uInt32 a(0); a < 20; a++)
- {
- if(!(a%6))
- {
- bUseLineInfo = !bUseLineInfo;
- }
-
- if(!(a%4))
- {
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- }
-
- if(a%3)
- {
- aStart = aStop;
- aStop = Point(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
- }
- else
- {
- aStart = Point(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
- aStop = Point(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
- }
-
- if(bUseLineInfo)
- {
- aOut.DrawLine(aStart, aStop, aLineInfo);
- }
- else
- {
- aOut.DrawLine(aStart, aStop);
- }
- }
- }
-
- if(false)
- {
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.DrawRect(aRectangle);
- }
-
- if(false)
- {
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- const sal_uInt32 nHor(aRectangle.getWidth() / 10);
- const sal_uInt32 nVer(aRectangle.getHeight() / 10);
- aOut.DrawRect(aRectangle, nHor, nVer);
- }
-
- if(false)
- {
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.DrawEllipse(aRectangle);
- }
-
- if(false)
- {
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.DrawArc(aRectangle, aRectangle.TopLeft(), aRectangle.BottomCenter());
- }
-
- if(false)
- {
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.DrawPie(aRectangle, aRectangle.TopLeft(), aRectangle.BottomCenter());
- }
-
- if(false)
- {
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.DrawChord(aRectangle, aRectangle.TopLeft(), aRectangle.BottomCenter());
- }
-
- if(false)
- {
- const double fHor(aRectangle.getWidth());
- const double fVer(aRectangle.getHeight());
-
- for(sal_uInt32 b(0); b < 5; b++)
- {
- const sal_uInt32 nCount(basegfx::fround(rand() * (20 / 32767.0)));
- const bool bClose(basegfx::fround(rand() / 32767.0));
- Polygon aPolygon(nCount + (bClose ? 1 : 0));
-
- for(sal_uInt32 a(0); a < nCount; a++)
- {
- const Point aPoint(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
- aPolygon[a] = aPoint;
- }
-
- if(bClose)
- {
- aPolygon[aPolygon.GetSize() - 1] = aPolygon[0];
- }
-
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
-
- if(!(b%2))
- {
- const LineInfo aLineInfo(LINE_SOLID, basegfx::fround(fHor / 50.0));
- aOut.DrawPolyLine(aPolygon, aLineInfo);
- }
- else
- {
- aOut.DrawPolyLine(aPolygon);
- }
- }
- }
-
- if(false)
- {
- const double fHor(aRectangle.getWidth());
- const double fVer(aRectangle.getHeight());
-
- for(sal_uInt32 b(0); b < 5; b++)
- {
- const sal_uInt32 nCount(basegfx::fround(rand() * (20 / 32767.0)));
- const bool bClose(basegfx::fround(rand() / 32767.0));
- Polygon aPolygon(nCount + (bClose ? 1 : 0));
-
- for(sal_uInt32 a(0); a < nCount; a++)
- {
- const Point aPoint(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
- aPolygon[a] = aPoint;
- }
-
- if(bClose)
- {
- aPolygon[aPolygon.GetSize() - 1] = aPolygon[0];
- }
-
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.DrawPolygon(aPolygon);
- }
- }
-
- if(false)
- {
- const double fHor(aRectangle.getWidth());
- const double fVer(aRectangle.getHeight());
- PolyPolygon aPolyPolygon;
-
- for(sal_uInt32 b(0); b < 3; b++)
- {
- const sal_uInt32 nCount(basegfx::fround(rand() * (6 / 32767.0)));
- const bool bClose(basegfx::fround(rand() / 32767.0));
- Polygon aPolygon(nCount + (bClose ? 1 : 0));
-
- for(sal_uInt32 a(0); a < nCount; a++)
- {
- const Point aPoint(
- aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)),
- aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0)));
- aPolygon[a] = aPoint;
- }
-
- if(bClose)
- {
- aPolygon[aPolygon.GetSize() - 1] = aPolygon[0];
- }
-
- aPolyPolygon.Insert(aPolygon);
- }
-
- aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)));
- aOut.DrawPolyPolygon(aPolyPolygon);
- }
-
- if(false)
- {
- SvFileStream aRead((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_READ);
- vcl::PNGReader aPNGReader(aRead);
- BitmapEx aBitmapEx(aPNGReader.Read());
- aOut.DrawBitmapEx(aRectangle.TopLeft(), aBitmapEx);
- }
-
- if(false)
- {
- SvFileStream aRead((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_READ);
- vcl::PNGReader aPNGReader(aRead);
- BitmapEx aBitmapEx(aPNGReader.Read());
- aOut.DrawBitmapEx(aRectangle.TopLeft(), aRectangle.GetSize(), aBitmapEx);
- }
-
- if(false)
- {
- SvFileStream aRead((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_READ);
- vcl::PNGReader aPNGReader(aRead);
- BitmapEx aBitmapEx(aPNGReader.Read());
- const Size aSizePixel(aBitmapEx.GetSizePixel());
- aOut.DrawBitmapEx(
- aRectangle.TopLeft(),
- aRectangle.GetSize(),
- Point(0, 0),
- Size(aSizePixel.Width() /2, aSizePixel.Height() / 2),
- aBitmapEx);
- }
-
- if(false)
- {
- const double fHor(aRectangle.getWidth());
- const double fVer(aRectangle.getHeight());
- const Point aPointA(
- aRectangle.Left() + basegfx::fround(fHor * 0.2),
- aRectangle.Top() + basegfx::fround(fVer * 0.3));
- const Point aPointB(
- aRectangle.Left() + basegfx::fround(fHor * 0.2),
- aRectangle.Top() + basegfx::fround(fVer * 0.5));
- const Point aPointC(
- aRectangle.Left() + basegfx::fround(fHor * 0.2),
- aRectangle.Top() + basegfx::fround(fVer * 0.7));
- const String aText(ByteString("Hello, World!"), RTL_TEXTENCODING_UTF8);
-
- const String aFontName(ByteString("Comic Sans MS"), RTL_TEXTENCODING_UTF8);
- Font aFont(aFontName, Size(0, 1000));
- aFont.SetAlign(ALIGN_BASELINE);
- aFont.SetColor(COL_RED);
- //sal_Int32* pDXArray = new sal_Int32[aText.Len()];
-
- aFont.SetOutline(true);
- aOut.SetFont(aFont);
- aOut.DrawText(aPointA, aText, 0, aText.Len());
-
- aFont.SetShadow(true);
- aOut.SetFont(aFont);
- aOut.DrawText(aPointB, aText, 0, aText.Len());
-
- aFont.SetRelief(RELIEF_EMBOSSED);
- aOut.SetFont(aFont);
- aOut.DrawText(aPointC, aText, 0, aText.Len());
-
- //delete pDXArray;
- }
-
- if(false)
- {
- const double fHor(aRectangle.getWidth());
- const double fVer(aRectangle.getHeight());
- const Point aPointA(
- aRectangle.Left() + basegfx::fround(fHor * 0.2),
- aRectangle.Top() + basegfx::fround(fVer * 0.3));
- const Point aPointB(
- aRectangle.Left() + basegfx::fround(fHor * 0.2),
- aRectangle.Top() + basegfx::fround(fVer * 0.5));
- const Point aPointC(
- aRectangle.Left() + basegfx::fround(fHor * 0.2),
- aRectangle.Top() + basegfx::fround(fVer * 0.7));
- const String aText(ByteString("Hello, World!"), RTL_TEXTENCODING_UTF8);
-
- const String aFontName(ByteString("Comic Sans MS"), RTL_TEXTENCODING_UTF8);
- Font aFont(aFontName, Size(0, 1000));
- aFont.SetAlign(ALIGN_BASELINE);
- aFont.SetColor(COL_RED);
-
- aOut.SetFont(aFont);
- const sal_Int32 nWidth(aOut.GetTextWidth(aText, 0, aText.Len()));
- aOut.DrawText(aPointA, aText, 0, aText.Len());
- aOut.DrawTextLine(aPointA, nWidth, STRIKEOUT_SINGLE, UNDERLINE_SINGLE, UNDERLINE_SMALLWAVE);
- aOut.DrawTextLine(aPointB, nWidth, STRIKEOUT_SINGLE, UNDERLINE_SINGLE, UNDERLINE_SMALLWAVE);
- aOut.DrawTextLine(aPointC, nWidth, STRIKEOUT_SINGLE, UNDERLINE_SINGLE, UNDERLINE_SMALLWAVE);
- }
-
- aMtf.Stop();
- aMtf.WindStart();
- aMtf.SetPrefMapMode(MapMode(MAP_100TH_MM));
- aMtf.SetPrefSize(Size(aRectangle.getWidth(), aRectangle.getHeight()));
-
- xPrimitive = Primitive2DReference(
- new MetafilePrimitive2D(
- aTransform,
- aMtf));
- }
- else
- {
-#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
// create MetafilePrimitive2D
const Graphic aGraphic(getGraphicObject().GetGraphic());
const GDIMetaFile& rMetafile = aTransformedGraphic.GetGDIMetaFile();
@@ -773,9 +320,6 @@ namespace drawinglayer
basegfx::B2DPolyPolygon(aMaskPolygon),
aChildContent));
}
-#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
- }
-#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
break;
}
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 762b7cb..e3bec68 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -97,29 +97,16 @@ namespace drawinglayer
const Point aEmptyPoint;
const Size aSizePixel(maContent.GetOutputSizePixel());
const bool bWasEnabledDst(mrOutDev.IsMapModeEnabled());
- static bool bDoSaveForVisualControl(false);
mrOutDev.EnableMapMode(false);
maContent.EnableMapMode(false);
Bitmap aContent(maContent.GetBitmap(aEmptyPoint, aSizePixel));
- if(bDoSaveForVisualControl)
- {
- SvFileStream aNew((const String&)String(ByteString( "c:\\content.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aContent;
- }
-
if(mpAlpha)
{
mpAlpha->EnableMapMode(false);
const AlphaMask aAlphaMask(mpAlpha->GetBitmap(aEmptyPoint, aSizePixel));
- if(bDoSaveForVisualControl)
- {
- SvFileStream aNew((const String&)String(ByteString( "c:\\transparence.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aAlphaMask.GetBitmap();
- }
-
mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aAlphaMask));
}
else if(mpMask)
@@ -127,12 +114,6 @@ namespace drawinglayer
mpMask->EnableMapMode(false);
const Bitmap aMask(mpMask->GetBitmap(aEmptyPoint, aSizePixel));
- if(bDoSaveForVisualControl)
- {
- SvFileStream aNew((const String&)String(ByteString( "c:\\mask.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aMask;
- }
-
mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aMask));
}
else if(0.0 != fTrans)
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index bd1f6ce..cf6abfe 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1928,15 +1928,6 @@ namespace drawinglayer
aBufferProcessor.process(rTransparence);
const AlphaMask aBmAlpha(aBufferDevice.GetBitmap(aEmptyPoint, aSizePixel));
-#ifdef DBG_UTIL
- static bool bDoSaveForVisualControl(false);
- if(bDoSaveForVisualControl)
- {
- SvFileStream aNew(String(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aBmContent;
- }
-#endif
-
// paint
mpOutputDevice->DrawBitmapEx(
aRectLogic.TopLeft(),
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index 340c8d4..2dc6582 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -604,15 +604,6 @@ namespace drawinglayer
aTransform.identity();
aTransform.scale(fScaleUp, fScaleUp, 1.0);
- if(false)
- {
- // when really want to go to single pixel lines, move to center.
- // Without this translation, all hor/ver hairlines will be centered exactly
- // between two pixel lines (which looks best)
- const double fTranslateToCenter(mnAntiAlialize * 0.5);
- aTransform.translate(fTranslateToCenter, fTranslateToCenter, 0.0);
- }
-
aSnappedHairline.transform(aTransform);
mpZBufferRasterConverter3D->rasterconvertB3DPolygon(aSnappedHairline, 0, mpBZPixelRaster->getHeight(), mnAntiAlialize);
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index db50607..cec3908 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -210,28 +210,6 @@ namespace sdr
aTopLeft, aSize, // destination
aTopLeft, aSize, // source
rSource);
-
-#ifdef DBG_UTIL
- // #i72754# possible graphical region test only with non-pro
- static bool bDoPaintForVisualControl(false);
- if(bDoPaintForVisualControl)
- {
- const bool bMapModeWasEnabledTest(getOutputDevice().IsMapModeEnabled());
- getOutputDevice().EnableMapMode(false);
- getOutputDevice().SetLineColor(COL_LIGHTRED);
- getOutputDevice().SetFillColor();
- getOutputDevice().DrawRect(aRegionRectanglePixel);
- getOutputDevice().EnableMapMode(bMapModeWasEnabledTest);
- }
-
- static bool bDoSaveForVisualControl(false);
- if(bDoSaveForVisualControl)
- {
- const Bitmap aBitmap(maBufferDevice.GetBitmap(aTopLeft, aSize));
- SvFileStream aNew((const String&)String(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aBitmap;
- }
-#endif
}
aRegion.EndEnumRects(aRegionHandle);
commit f529f47d20471c06382ac2584dd9254c63068dca
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 9 19:35:48 2011 +0100
Remove unused basic/workben
diff --git a/basic/workben/basmgr.src b/basic/workben/basmgr.src
deleted file mode 100644
index e53efc8..0000000
--- a/basic/workben/basmgr.src
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#pragma CHARSET_IBMPC
-
-String 300 {
- Text = "Dummy";
-};
diff --git a/basic/workben/makefile.mk b/basic/workben/makefile.mk
deleted file mode 100644
index def3873..0000000
--- a/basic/workben/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=basic
-TARGET=miniapp
-TARGETTYPE=GUI
-
-# --- Settings ---------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- SBASIC IDE --------------------------------------------------------
-
-APP1TARGET=$(PRJNAME)app
-APP1STDLIBS= \
- $(SALLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(COMPHELPERLIB) \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SOTLIB) \
-
-.IF "$(GUI)"!="OS2"
-APP1LIBS= \
- $(LB)$/basic.lib
-.ENDIF
-APP1LIBS+= \
- $(LB)$/app.lib \
- $(LB)$/sample.lib
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="OS2"
-APP1STDLIBS+= \
- $(BASICLIB)
-.ENDIF
-
-
-APP1DEPN= $(L)$/itools.lib $(SVLIBDEPEND) $(LB)$/basic.lib $(LB)$/app.lib $(LB)$/sample.lib
-
-APP1OBJS = $(OBJ)$/ttbasic.obj
-
-.IF "$(GUI)" != "UNX"
-APP1OBJS+= \
- $(OBJ)$/app.obj \
- $(SLO)$/sbintern.obj
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
deleted file mode 100644
index 0e03fff..0000000
--- a/basic/workben/mgrtest.cxx
+++ /dev/null
@@ -1,590 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_basic.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/sound.hxx>
-#include <basic/basmgr.hxx>
-#include <basic/sbx.hxx>
-#include <basic/sbmod.hxx>
-#include <basic/basrdll.hxx>
-
-// Defines for ToolBox-Id's
-#define TB_NEW 1
-#define TB_OPENSTORAGE 2
-#define TB_SAVESTORAGE 3
-#define TB_ORG 4
-#define TB_CREATELIB1 10
-#define TB_CREATELIB2 11
-#define TB_CREATELIB3 12
-#define TB_LOADLIB1 20
-#define TB_LOADLIB2 21
-#define TB_LOADLIB3 22
-#define TB_STORELIBX 30
-#define TB_UNLOADX 31
-#define TB_LOADX 32
-#define TB_EXECX 33
-#define TB_REMOVEX 34
-#define TB_REMOVEDELX 35
-
-#define TB_LIB0 40
-#define TB_LIB1 41
-#define TB_LIB2 42
-#define TB_LIB3 43
-
-const char* pLib1Str = "Lib1";
-const char* pLib2Str = "Lib2";
-const char* pLib3Str = "Lib3";
-
-// Test-Application
-class TestApp : public Application
-{
-public:
- virtual void Main( void );
- virtual void Main( int, char*[] );
-};
-
-// Test-Window with a ToolBox to choose a test from
-// and the typically used virtual methods
-class TestWindow : public WorkWindow
-{
-private:
- ToolBox aToolBox;
- BasicManager* pBasMgr;
-
- void CheckError();
- USHORT nLibX;
- DECL_LINK( BasicErrorHdl, StarBASIC * );
-
-
-public:
- TestWindow();
- ~TestWindow();
-
- virtual void Paint( const Rectangle& );
- virtual void Resize();
- virtual void KeyInput( const KeyEvent& rKeyEvt );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
-
- DECL_LINK( TBSelect, ToolBox * );
- void UpdateToolBox();
- void ShowInfo();
-};
-
-TestWindow::~TestWindow()
-{
-}
-
-TestWindow::TestWindow() :
- WorkWindow( NULL, WB_APP | WB_STDWORK | WB_3DLOOK | WB_CLIPCHILDREN ) ,
- aToolBox( this, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_LINESPACING ) )
-{
- nLibX = 0;
-
- aToolBox.SetButtonType( BUTTON_TEXT );
- aToolBox.SetLineCount( 2 );
- aToolBox.SetPosPixel( Point( 0, 0 ) );
- aToolBox.SetSelectHdl( LINK( this, TestWindow, TBSelect ) );
-
- Font aFont;
- aFont.SetName( "Helv" );
- aFont.SetSize( Size( 0, 6 ) );
- aFont.SetPitch( PITCH_VARIABLE );
- aFont.SetFamily( FAMILY_SWISS );
- aFont.SetTransparent( TRUE );
- aFont.SetAlign( ALIGN_TOP );
- aToolBox.SetFont( aFont );
- SetFont( aFont );
-
- aToolBox.InsertItem( TB_NEW, "New" );
- aToolBox.SetHelpText( TB_NEW, "New BasicManager" );
- aToolBox.InsertItem( TB_OPENSTORAGE, "Load" );
- aToolBox.SetHelpText( TB_OPENSTORAGE, "Load Storage D:\\MYSTORE.SVS" );
- aToolBox.InsertItem( TB_SAVESTORAGE, "Save" );
- aToolBox.SetHelpText( TB_SAVESTORAGE, "Save Storage D:\\MYSTORE.SVS" );
-
- aToolBox.InsertSeparator();
-
- aToolBox.InsertItem( TB_ORG, "Verwalten" );
- aToolBox.SetHelpText( TB_ORG, "Libaries verwalten" );
-
- aToolBox.InsertSeparator();
-
- aToolBox.InsertItem( TB_LIB0, "0" );
- aToolBox.SetHelpText( TB_LIB0, "Aktuelle Lib: STANDARD" );
- aToolBox.InsertItem( TB_LIB1, "1" );
- aToolBox.SetHelpText( TB_LIB1, "Aktuelle Lib: 1" );
- aToolBox.InsertItem( TB_LIB2, "2" );
- aToolBox.SetHelpText( TB_LIB2, "Aktuelle Lib: 2" );
- aToolBox.InsertItem( TB_LIB3, "3" );
- aToolBox.SetHelpText( TB_LIB3, "Aktuelle Lib: 3" );
-
- aToolBox.InsertBreak();
- aToolBox.InsertItem( TB_CREATELIB1, "CreateLib1" );
- aToolBox.SetHelpText( TB_CREATELIB1, "Create Libary LIB1" );
- aToolBox.InsertItem( TB_CREATELIB2, "CreateLib2" );
- aToolBox.SetHelpText( TB_CREATELIB2, "Create Libary LIB2" );
- aToolBox.InsertItem( TB_CREATELIB3, "CreateLib3" );
- aToolBox.SetHelpText( TB_CREATELIB3, "Create Libary LIB3" );
-
- aToolBox.InsertSeparator();
- aToolBox.InsertItem( TB_LOADLIB1, "LoadLib1" );
- aToolBox.SetHelpText( TB_LOADLIB1, "Load Libary LIB1" );
- aToolBox.InsertItem( TB_LOADLIB2, "LoadLib2" );
- aToolBox.SetHelpText( TB_LOADLIB2, "Load Libary LIB2" );
- aToolBox.InsertItem( TB_LOADLIB3, "LoadLib3" );
- aToolBox.SetHelpText( TB_LOADLIB3, "Load Libary LIB3" );
-
- aToolBox.InsertSeparator();
- aToolBox.InsertItem( TB_STORELIBX, "StoreLibX" );
- aToolBox.SetHelpText( TB_STORELIBX, "Store Libary LIBX" );
- aToolBox.InsertItem( TB_UNLOADX, "UnloadX" );
- aToolBox.SetHelpText( TB_UNLOADX, "Unload Libary LIBX" );
- aToolBox.InsertItem( TB_LOADX, "LoadX" );
- aToolBox.SetHelpText( TB_LOADX, "Load Libary LIBX" );
- aToolBox.InsertItem( TB_EXECX, "ExecX" );
- aToolBox.SetHelpText( TB_EXECX, "Execute 'Libary' LIBX" );
- aToolBox.InsertItem( TB_REMOVEX, "RemoveX" );
- aToolBox.SetHelpText( TB_REMOVEX, "Remove Libary LIBX" );
- aToolBox.InsertItem( TB_REMOVEDELX, "RemDelX" );
- aToolBox.SetHelpText( TB_REMOVEDELX, "Remove and delete Libary LIBX" );
-
- pBasMgr = 0;
-
- Show();
- UpdateToolBox();
- aToolBox.Show();
-}
-void TestWindow::ShowInfo()
-{
- Invalidate();
- Update();
- long nH = GetTextSize( "X" ).Height();
- if ( pBasMgr )
- {
- Point aPos( 10, aToolBox.GetSizePixel().Height()+5 );
- for ( USHORT nLib = 0; nLib < pBasMgr->GetLibCount(); nLib++ )
- {
- String aOutStr( nLib );
- aOutStr +=": ";
- StarBASIC* pL = pBasMgr->GetLib( nLib );
- aOutStr += '[';
- aOutStr += pBasMgr->GetLibName( nLib );
- aOutStr += "]<";
- if ( pL )
- aOutStr += pL->GetName();
- else
- aOutStr += "NoLoaded";
- aOutStr += ">, Storage='";
- aOutStr += pBasMgr->GetLibStorageName( nLib );
- aOutStr += "', bLoaded=";
- aOutStr += (USHORT)pBasMgr->IsLibLoaded( nLib );
- DrawText( aPos, aOutStr );
- aPos.Y() += nH;
- }
- }
-}
-
-void TestWindow::UpdateToolBox()
-{
- // View of some buttons as checked or disabled if
- // wished by tests
- aToolBox.EnableItem( TB_ORG, (BOOL)(ULONG)pBasMgr );
-
- aToolBox.EnableItem( TB_CREATELIB1, (BOOL)(ULONG)pBasMgr );
- aToolBox.EnableItem( TB_CREATELIB2, (BOOL)(ULONG)pBasMgr );
- aToolBox.EnableItem( TB_CREATELIB3, (BOOL)(ULONG)pBasMgr );
-
- aToolBox.EnableItem( TB_LOADLIB1, (BOOL)(ULONG)pBasMgr );
- aToolBox.EnableItem( TB_LOADLIB2, (BOOL)(ULONG)pBasMgr );
- aToolBox.EnableItem( TB_LOADLIB3, (BOOL)(ULONG)pBasMgr );
-
- aToolBox.EnableItem( TB_STORELIBX, (BOOL)(ULONG)pBasMgr );
- aToolBox.EnableItem( TB_EXECX, (BOOL)(ULONG)pBasMgr );
- aToolBox.EnableItem( TB_UNLOADX, (BOOL)(ULONG)pBasMgr );
- aToolBox.EnableItem( TB_LOADX, (BOOL)(ULONG)pBasMgr );
- aToolBox.EnableItem( TB_REMOVEX, (BOOL)(ULONG)pBasMgr );
- aToolBox.EnableItem( TB_REMOVEDELX, (BOOL)(ULONG)pBasMgr );
-
- aToolBox.CheckItem( TB_LIB0, nLibX == 0 );
- aToolBox.CheckItem( TB_LIB1, nLibX == 1 );
- aToolBox.CheckItem( TB_LIB2, nLibX == 2 );
- aToolBox.CheckItem( TB_LIB3, nLibX == 3 );
-}
-
-IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
-{
- USHORT nId = aToolBox.GetCurItemId();
- BOOL bChecked = aToolBox.IsItemChecked( nId );
- switch ( nId )
- {
- case TB_NEW:
- {
- delete pBasMgr;
- pBasMgr = new BasicManager( new StarBASIC );
- pBasMgr->SetStorageName( "d:\\mystore.svs" );
- }
- break;
- case TB_OPENSTORAGE:
- {
- delete pBasMgr;
- SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs", STREAM_READ | STREAM_SHARE_DENYWRITE );
- DBG_ASSERT( xStorage.Is(), "Kein Storage!" );
- pBasMgr = new BasicManager( *xStorage );
- }
- break;
- case TB_SAVESTORAGE:
- {
- if ( pBasMgr)
- {
- SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
- DBG_ASSERT( xStorage.Is(), "Kein Storage!" );
- pBasMgr->Store( *xStorage );
- }
- }
- break;
- case TB_ORG:
- {
- if ( pBasMgr)
- {
- InfoBox( 0, "Organisieren..." ).Execute();
- }
- }
- break;
- case TB_CREATELIB1:
- {
- if ( pBasMgr )
- {
- USHORT nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib1Str ) );
- if ( nLib != LIB_NOTFOUND )
- {
- pBasMgr->SetLibStorageName( nLib, "d:\\mystore.svs" );
- StarBASIC* pLib = pBasMgr->GetLib( pLib1Str );
- DBG_ASSERT( pLib, "Lib?!" );
- String aSource( "Sub SubInLib1Mod1\nprint\"XXX\"\nEnd Sub");
- SbModule* pM = pLib->MakeModule( "ModLib1", aSource );
- DBG_ASSERT( pM, "Modul?" );
- pLib->Compile( pM );
- }
- else
- InfoBox( 0, "CreateLibary fehlgeschlagen..." ).Execute();
- }
- }
- break;
- case TB_CREATELIB2:
- {
- if ( pBasMgr )
- {
- USHORT nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib2Str ) );
- if ( nLib != LIB_NOTFOUND )
- {
- pBasMgr->SetLibStorageName( nLib, "d:\\mystore.svs" );
- StarBASIC* pLib = pBasMgr->GetLib( pLib2Str );
- DBG_ASSERT( pLib, "Lib?!" );
- SbModule* pM = pLib->MakeModule( "ModuleLib2", "Sub SubInLib2\n print \"Tralala\" \nEnd Sub\n" );
- pLib->Compile( pM );
- }
- else
- InfoBox( 0, "CreateLibary fehlgeschlagen..." ).Execute();
- }
- }
- break;
- case TB_CREATELIB3:
- {
- if ( pBasMgr )
- {
- // is located in another storage !!!
- USHORT nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib3Str ) );
- if ( nLib != LIB_NOTFOUND )
- {
- pBasMgr->SetLibStorageName( nLib, "d:\\mystore2.svs" );
- StarBASIC* pLib = pBasMgr->GetLib( pLib3Str );
- DBG_ASSERT( pLib, "Lib?!" );
- SbModule* pM = pLib->MakeModule( "ModuleLib2", "Sub XYZInLib3\n print \"?!\" \nEnd Sub\n" );
- pLib->Compile( pM );
- }
- else
- InfoBox( 0, "CreateLibary fehlgeschlagen..." ).Execute();
- }
- }
- break;
- case TB_LOADLIB1:
- {
- if ( pBasMgr )
- {
- SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
- if ( !pBasMgr->AddLib( *xStorage, pLib1Str, FALSE ) )
- Sound::Beep();
- }
- }
- break;
- case TB_LOADLIB2:
- {
- if ( pBasMgr )
- {
- SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
- if ( !pBasMgr->AddLib( *xStorage, pLib2Str, FALSE ) )
- Sound::Beep();
- }
- }
- break;
- case TB_LOADLIB3:
- {
- if ( pBasMgr )
- {
- // is located in another storage !!!
- SvStorageRef xStorage = new SvStorage( "d:\\mystore2.svs" );
- if ( !pBasMgr->AddLib( *xStorage, pLib3Str, FALSE ) )
- Sound::Beep();
- }
- }
- break;
- case TB_STORELIBX:
- {
- if ( pBasMgr )
- pBasMgr->StoreLib( nLibX );
- }
- break;
- case TB_UNLOADX:
- {
- if ( pBasMgr )
- pBasMgr->UnloadLib( nLibX );
- }
- break;
- case TB_LOADX:
- {
- if ( pBasMgr )
- pBasMgr->LoadLib( nLibX );
- }
- break;
- case TB_REMOVEX:
- {
- if ( pBasMgr )
- pBasMgr->RemoveLib( nLibX, FALSE );
- }
- break;
- case TB_REMOVEDELX:
- {
- if ( pBasMgr )
- pBasMgr->RemoveLib( nLibX, TRUE );
- }
- break;
- case TB_EXECX:
- {
- if ( pBasMgr )
- {
- StarBASIC* pBasic = pBasMgr->GetLib( nLibX );
- if ( pBasic && pBasic->GetModules()->Count() )
- {
- pBasic->SetErrorHdl( LINK( this, TestWindow, BasicErrorHdl ) );
-
- SbModule* pMod = (SbModule*)pBasic->GetModules()->Get( 0 );
- if ( pMod && pMod->GetMethods()->Count() )
- pMod->GetMethods()->Get(0)->GetInteger();
- }
- }
- }
- break;
-
- case TB_LIB0: nLibX = 0;
- break;
- case TB_LIB1: nLibX = 1;
- break;
- case TB_LIB2: nLibX = 2;
- break;
- case TB_LIB3: nLibX = 3;
- break;
- }
-
- UpdateToolBox();
- CheckError();
- ShowInfo();
- return 0;
-}
-
-void TestWindow::CheckError()
-{
- if ( pBasMgr )
- {
- BasicError* pError = pBasMgr->GetFirstError();
- while ( pError )
- {
- String aErrorStr;
- String aReasonStr;
- switch ( pError->GetErrorId() )
- {
- case BASERR_ID_STDLIBOPEN:
- aErrorStr = "Standard-Lib konnte nicht geoffnet werden.";
- break;
- case BASERR_ID_STDLIBSAVE:
- aErrorStr = "Standard-Lib konnte nicht gespeichert werden.";
- break;
- case BASERR_ID_LIBLOAD:
- aErrorStr = "Lib konnte nicht geoffnet werden.";
- break;
- case BASERR_ID_LIBCREATE:
- aErrorStr = "Lib konnte nicht erzeugt werden.";
- break;
- case BASERR_ID_LIBSAVE:
- aErrorStr = "Lib konnte nicht gespeichert werden.";
- break;
- case BASERR_ID_MGROPEN:
- aErrorStr = "Manager konnte nicht geladen werden.";
- break;
- case BASERR_ID_MGRSAVE:
- aErrorStr = "Manager konnte nicht gespeichert werden.";
- break;
- case BASERR_ID_UNLOADLIB:
- aErrorStr = "Libary konnte nicht entladen werden.";
- break;
- case BASERR_ID_REMOVELIB:
- aErrorStr = "Libary konnte nicht entfernt werden.";
- break;
- default:
- aErrorStr = "Unbekannter Fehler!";
- }
-
- switch ( pError->GetReason() )
- {
- case BASERR_REASON_OPENSTORAGE:
- aReasonStr = "Der Storage konnte nicht geoeffnet werden";
- break;
- case BASERR_REASON_OPENLIBSTORAGE:
- aReasonStr = "Der Lib-Storage konnte nicht geoeffnet werden";
- break;
- case BASERR_REASON_OPENMGRSTREAM:
- aReasonStr = "Der Manager-Stream konnte nicht geoeffnet werden";
- break;
- case BASERR_REASON_OPENLIBSTREAM:
- aReasonStr = "Der Basic-Stream konnte nicht geoeffnet werden";
- break;
- case BASERR_REASON_STDLIB:
- aReasonStr = "STANDARD-Lib";
- break;
- case BASERR_REASON_BASICLOADERROR:
- aReasonStr = "Fehler beim Laden des Basics";
- default:
- aReasonStr = " - ";
- }
-
- String aErr( aErrorStr );
- aErr += "\nGrund: ";
- aErr += aReasonStr;
- InfoBox( 0, aErr ).Execute();
-
- pError = pBasMgr->GetNextError();
- }
- pBasMgr->ClearErrors();
- }
-}
-
-void TestWindow::Paint( const Rectangle& rRec )
-{
-}
-
-void TestWindow::Resize()
-{
- Size aTBSz = aToolBox.CalcWindowSizePixel();
- aToolBox.SetSizePixel( Size( GetOutputSizePixel().Width(), aTBSz.Height()) );
- Invalidate();
- ShowInfo();
-}
-
-void TestWindow::KeyInput( const KeyEvent& rKEvt )
-{
- char nCharCode = rKEvt.GetCharCode();
- USHORT nCode = rKEvt.GetKeyCode().GetCode();
-
- // Only at Alt-Return
- if ( ( nCode == KEY_RETURN ) && rKEvt.GetKeyCode().IsMod2() )
- ;
- else
- WorkWindow::KeyInput( rKEvt );
-
- UpdateToolBox();
-}
-
-void TestWindow::MouseMove( const MouseEvent& rMEvt )
-{
-}
-
-void TestWindow::MouseButtonDown( const MouseEvent& rMEvt )
-{
- ShowInfo();
-}
-
-void TestWindow::MouseButtonUp( const MouseEvent& rMEvt )
-{
- UpdateToolBox();
-}
-
-IMPL_LINK( TestWindow, BasicErrorHdl, StarBASIC *, pBasic )
-{
- String aErrorText( pBasic->GetErrorText() );
-
- String aErrorTextPrefix;
- if( pBasic->IsCompilerError() )
- {
- aErrorTextPrefix = "Compilererror: ";
- }
- else
- {
- aErrorTextPrefix = "Runtimeerror: ";
- aErrorTextPrefix += pBasic->GetErrorCode();
- aErrorTextPrefix += " ";
- }
-
- InfoBox( 0, String( aErrorTextPrefix + aErrorText ) ).Execute();
- return 0;
-}
-
-void TestApp::Main( void )
-{
- Main( 0, NULL );
-}
-
-void TestApp::Main( int, char*[] )
-{
- BasicDLL aBasiDLL;
- SvFactory::Init();
- EnableSVLook();
- TestWindow aWindow;
- Execute();
- SvFactory::DeInit();
-}
-
-
-TestApp aTestApp;
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 85a54d6efe3b1a415a48c3f842c5ecf4c1f6276e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 9 19:33:32 2011 +0100
Remove some dead code
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index 5de9fba..ca25630 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -34,7 +34,7 @@
#include <vcl/window.hxx>
#include <com/sun/star/frame/XFrame.hpp>
-#ifdef ENABLE_INIMANAGER//MUSTINI
+#ifdef ENABLE_INIMANAGER
#include "inimgr.hxx"
#endif
#include <sfx2/shell.hxx>
@@ -48,11 +48,6 @@ class SfxChildWindow;
class SfxChildWindowContext;
class SfxChildWinContextArr_Impl;
-//ASDBG #ifndef _XFRAME_REF
-//ASDBG #define _XFRAME_REF
-//ASDBG USR_DECLIMPL_REF( ::com::sun::star::frame::XFrame, ::com::sun::star::uno::XInterface );
-//ASDBG #endif
-
#define SFX_CHILDWIN_ZOOMIN 0x01 // ganz eingeklapptes Float
#define SFX_CHILDWIN_SMALL 0x02 // halb eingeklapptes Float
#define SFX_CHILDWIN_FORCEDOCK 0x04 // Float verboten
@@ -196,10 +191,8 @@ public:
void SetPosSizePixel(const Point& rPoint, Size& rSize);
Point GetPosPixel()
{ return pWindow->GetPosPixel(); }
-//<!--Modified by PengYunQuan for Validity Cell Range Picker
virtual void Hide();
virtual void Show( USHORT nFlags );
-//-->Modified by PengYunQuan for Validity Cell Range Picker
sal_uInt16 GetFlags() const
{ return GetInfo().nFlags; }
sal_Bool CanGetFocus() const;
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
index 904ea37..bcd6f7d 100644
--- a/sfx2/inc/sfx2/minstack.hxx
+++ b/sfx2/inc/sfx2/minstack.hxx
@@ -28,7 +28,6 @@
#ifndef _SFXMINSTACK_HXX
#define _SFXMINSTACK_HXX
-//ASDBG #ifndef _SFXMINARRAY_HXX
#include <sfx2/minarray.hxx>
#define DECL_OBJSTACK( ARR, T, nI, nG ) \
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 71fd61f..38bf3ff 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -43,12 +43,9 @@
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-
#include <com/sun/star/beans/XPropertySet.hpp>
-
#include <boost/shared_ptr.hpp>
-
//________________________________________________________________________________________________________________
// include something else
//________________________________________________________________________________________________________________
@@ -290,9 +287,7 @@ public:
void SetNoName();
sal_Bool IsInModalMode() const;
sal_Bool IsInPrepareClose() const;
- //<!--Added by PengYunQuan for Validity Cell Range Picker
virtual sal_Bool AcceptStateUpdate() const;
- //-->Added by PengYunQuan for Validity Cell Range Picker
sal_Bool HasModalViews() const;
sal_Bool IsHelpDocument() const;
@@ -503,8 +498,6 @@ public:
SfxProgress* GetProgress() const;
void SetWaitCursor( BOOL bSet ) const;
-//(mba) virtual SotObjectRef CreateAggObj( const SotFactory* pFact );
-
// Naming Interface
void SetTitle( const String& rTitle );
String GetTitle( sal_uInt16 nMaxLen = 0 ) const;
@@ -792,7 +785,6 @@ public:
SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = FALSE );
SAL_DLLPRIVATE sal_Bool QuerySaveSizeExceededModules_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
-//#endif
};
#define SFX_GLOBAL_CLASSID \
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 5ed3fd4..0808ecb 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -196,14 +196,8 @@ void SfxApplication::EnterBasicCall()
{
DBG_TRACE( "SfxShellObject: BASIC-on-demand" );
- // das kann l"anger dauern, da Progress nicht geht, wenigstens Sanduhr
-//(mba)/task SfxWaitCursor aWait;
-
// zuerst das BASIC laden
GetBasic();
-
- // Factories anmelden
-// SbxBase::AddFactory( new SfxSbxObjectFactory_Impl );
}
}
@@ -228,7 +222,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
{
SbxObject* pObject = SbxBase::CreateObject( pItem->GetValue() );
pObject->AddRef();
-//(mba) rReq.SetReturnValue( SfxObjectItem( 0, pObject ) );
rReq.Done();
}
break;
@@ -237,11 +230,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
case SID_DELETE_BASICOBJECT:
{
SFX_REQUEST_ARG(rReq, pItem, SfxObjectItem, nSID, sal_False);
- if ( pItem )
- {
-//(mba) SbxObject* pObject = pItem->GetObject();
-//(mba) pObject->ReleaseRef();
- }
break;
}
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 95afd8a..bc29d1a 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -60,8 +60,6 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-
-
#include <com/sun/star/script/provider/XScript.hpp>
#include <com/sun/star/script/provider/XScriptProvider.hpp>
#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
@@ -228,25 +226,6 @@ void SfxObjectShell::FlushDocInfo()
sal_Int32 delay(xDocProps->getAutoloadSecs());
SetAutoLoad( INetURLObject(url), delay * 1000,
(delay > 0) || url.getLength() );
-/*
- // bitte beachten:
- // 1. Titel in DocInfo aber nicht am Doc (nach HTML-Import)
- // => auch am Doc setzen
- // 2. Titel in DocInfo leer (Briefumschlagsdruck)
- // => nicht am Doc setzen, da sonst "unbenanntX" daraus wird
- String aDocInfoTitle = GetDocInfo().GetTitle();
- if ( aDocInfoTitle.Len() )
- SetTitle( aDocInfoTitle );
- else
- {
- pImp->aTitle.Erase();
- SetNamedVisibility_Impl();
- if ( GetMedium() )
- {
- SfxShell::SetName( GetTitle(SFX_TITLE_APINAME) );
- Broadcast( SfxSimpleHint(SFX_HINT_TITLECHANGED) );
- }
- }*/
}
//-------------------------------------------------------------------------
@@ -454,8 +433,6 @@ void SfxObjectShell::SetReadOnlyUI( sal_Bool bReadOnly )
if ( bWasRO != IsReadOnly() )
{
Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) );
- //if ( pImp->pDocInfo )
- // pImp->pDocInfo->SetReadOnly( IsReadOnly() );
}
}
@@ -499,12 +476,10 @@ sal_Bool SfxObjectShell::IsInModalMode() const
return pImp->bModalMode || pImp->bRunningMacro;
}
-//<!--Added by PengYunQuan for Validity Cell Range Picker
sal_Bool SfxObjectShell::AcceptStateUpdate() const
{
return !IsInModalMode();
}
-//-->Added by PengYunQuan for Validity Cell Range Picker
//-------------------------------------------------------------------------
@@ -829,9 +804,6 @@ void SfxObjectShell::SetTitle
// Title setzen
pImp->aTitle = rTitle;
-// Wieso denn in der DocInfo?
-// GetDocInfo().SetTitle( rTitle );
-// FlushDocInfo();
// Benachrichtigungen
if ( GetMedium() )
@@ -908,19 +880,10 @@ String SfxObjectShell::GetTitle
*/
{
-// if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
-// return String();
SfxMedium *pMed = GetMedium();
if ( IsLoading() )
return String();
-/* if ( !nMaxLength && pImp->pDocInfo )
- {
- String aTitle = pImp->pDocInfo->GetTitle();
- if ( aTitle.Len() )
- return aTitle;
- } */
-
// Titel erzeugen?
if ( SFX_TITLE_DETECT == nMaxLength && !pImp->aTitle.Len() )
{
@@ -1061,8 +1024,6 @@ void SfxObjectShell::InvalidateName()
{
// Title neu erzeugen
pImp->aTitle.Erase();
-// pImp->nVisualDocumentNumber = USHRT_MAX;
- //GetTitle( SFX_TITLE_DETECT );
SetName( GetTitle( SFX_TITLE_APINAME ) );
// Benachrichtigungen
@@ -1575,14 +1536,6 @@ void SfxObjectShell::CancelTransfers()
AbortImport();
if( IsLoading() )
FinishedLoading( SFX_LOADED_ALL );
-
-/*
- SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this );
- while( pFrame )
- {
- pFrame->CancelTransfers();
- pFrame = SfxViewFrame::GetNext( *pFrame, this );
- }*/
}
}
@@ -1899,32 +1852,6 @@ void SfxObjectShell::SetFlags( SfxObjectShellFlags eFlags )
pImp->eFlags = eFlags;
}
-/*
-void SfxObjectShell::SetBaseURL( const String& rURL )
-{
- pImp->aBaseURL = rURL;
- pImp->bNoBaseURL = FALSE;
-}
-
-const String& SfxObjectShell::GetBaseURLForSaving() const
-{
- if ( pImp->bNoBaseURL )
- return String();
- return GetBaseURL();
-}
-
-const String& SfxObjectShell::GetBaseURL() const
-{
- if ( pImp->aBaseURL.Len() )
- return pImp->aBaseURL;
- return pMedium->GetBaseURL();
-}
-
-void SfxObjectShell::SetEmptyBaseURL()
-{
- pImp->bNoBaseURL = TRUE;
-}
-*/
String SfxObjectShell::QueryTitle( SfxTitleQuery eType ) const
{
String aRet;
@@ -1989,7 +1916,6 @@ void SfxHeaderAttributes_Impl::SetAttribute( const SvKeyValue& rKV )
}
else
{
-// DBG_ERROR( "Schlechtes ::com::sun::star::util::DateTime fuer Expired" );
pDoc->GetMedium()->SetExpired_Impl( Date( 1, 1, 1970 ) );
}
}
@@ -2089,7 +2015,6 @@ sal_Bool SfxObjectShell::IsSecure()
return sal_False;
if ( aOpt.IsSecureURL( aURL.GetMainURL( INetURLObject::NO_DECODE ), aReferer ) )
- //if ( SvtSecurityOptions().IsSecureURL( aURL.GetMainURL( INetURLObject::NO_DECODE ), aReferer ) )
{
if ( GetMedium()->GetContent().is() )
{
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index c10d000..0393239 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -291,7 +291,6 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
// andernfalls Doc-Shell anlegen
if ( !pEntry->aDocShell.Is() )
{
-//(mba)/task SfxWaitCursor aWaitCursor;
INetURLObject aFileObj( pEntry->aFileName );
BOOL bDum = FALSE;
SfxApplication* pSfxApp = SFX_APP();
@@ -366,7 +365,6 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell(USHORT nRegion,
*/
{
-//(mba)/task SfxWaitCursor aWaitCursor;
return pTemplates->CreateObjectShell(nRegion, nIdx);
}
commit d7f8a60dd9056fe83f9f2adf006e6dd219f720e8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 9 19:18:57 2011 +0100
Remove dead code. 'slow' never gets defined
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 291d377..c1c1a73 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -481,10 +481,6 @@ void SfxBindings::Update
DBG_MEMTEST();
DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
-//!!TLX: leads to Template Gallery freeze
-// if ( nRegLevel )
-// return;
-
if ( pDispatcher )
pDispatcher->Flush();
@@ -710,21 +706,13 @@ void SfxBindings::InvalidateAll
for ( sal_uInt16 n = 0; n < pImp->pCaches->Count(); ++n )
pImp->pCaches->GetObject(n)->Invalidate(bWithMsg);
-/*
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame
- ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
- if ( bWithMsg && xFrame.is() )
- xFrame->contextChanged();
-*/
pImp->nMsgPos = 0;
if ( !nRegLevel )
{
pImp->aTimer.Stop();
pImp->aTimer.SetTimeout(TIMEOUT_FIRST);
pImp->aTimer.Start();
-// pImp->bFirstRound = sal_True;
-// pImp->nFirstShell = 0;
}
DBG_PROFSTOP(SfxBindingsInvalidateAll);
@@ -739,8 +727,6 @@ void SfxBindings::Invalidate
)
{
DBG_PROFSTART(SfxBindingsInvalidateAll);
-// DBG_ASSERT( !pImp->bInUpdate, "SfxBindings::Invalidate while in update" );
-
DBG_MEMTEST();
if ( pImp->bInUpdate )
@@ -784,8 +770,6 @@ void SfxBindings::Invalidate
pImp->aTimer.Stop();
pImp->aTimer.SetTimeout(TIMEOUT_FIRST);
pImp->aTimer.Start();
-// pImp->bFirstRound = sal_True;
-// pImp->nFirstShell = 0;
}
DBG_PROFSTOP(SfxBindingsInvalidateAll);
@@ -863,7 +847,6 @@ void SfxBindings::Invalidate
)
{
DBG_MEMTEST();
-// DBG_ASSERT( !pImp->bInUpdate, "SfxBindings::Invalidate while in update" );
if ( pImp->bInUpdate )
{
@@ -1104,11 +1087,6 @@ void SfxBindings::Release( SfxControllerItem& rItem )
// was this the last controller?
if ( pCache->GetItemLink() == 0 && !pCache->GetInternalController() )
{
-#ifdef slow
- // remove the BoundFunc
- delete (*pImp->pCaches)[nPos];
- pImp->pCaches->Remove(nPos, 1);
-#endif
if ( SfxMacroConfig::IsMacroSlot( nId ) )
{
delete (*pImp->pCaches)[nPos];
@@ -1366,7 +1344,6 @@ void SfxBindings::UpdateSlotServer_Impl()
// synchronize
pDispatcher->Flush();
-// pDispatcher->Update_Impl();
if ( pImp->bAllMsgDirty )
{
@@ -1374,8 +1351,6 @@ void SfxBindings::UpdateSlotServer_Impl()
{
::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame
( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
- //if ( xFrame.is() )
- // xFrame->contextChanged();
pImp->bContextChanged = FALSE;
}
else
@@ -1449,7 +1424,6 @@ SfxItemSet* SfxBindings::CreateSet_Impl
{
pRealSlot = pInterface->GetRealSlot(pMsgSvr->GetSlot());
pCache = GetStateCache( pRealSlot->GetSlotId() );
-// DBG_ASSERT( pCache, "No slot cache found for the master slot!" );
}
else
pRealSlot = pMsgSvr->GetSlot();
@@ -1699,10 +1673,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
// modifying the SfxObjectInterface-stack without SfxBindings => nothing to do
SfxViewFrame* pFrame = pDispatcher->GetFrame();
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //if ( (pFrame && pFrame->GetObjectShell()->IsInModalMode()) || pSfxApp->IsDowning() || !pImp->pCaches->Count() )
if ( (pFrame && !pFrame->GetObjectShell()->AcceptStateUpdate()) || pSfxApp->IsDowning() || !pImp->pCaches->Count() )
- //-->Modified by PengYunQuan for Validity Cell Range Picker
{
DBG_PROFSTOP(SfxBindingsNextJob_Impl0);
return sal_True;
@@ -1742,24 +1713,9 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
sal_Bool bWasDirty = pCache->IsControllerDirty();
if ( bWasDirty )
{
-/*
- sal_Bool bSkip = sal_False;
- if ( pImp->bFirstRound )
- {
- const SfxSlotServer *pMsgServer =
- pCache->GetSlotServer(*pDispatcher, pImp->xProv);
- if ( pMsgServer &&
- pMsgServer->GetShellLevel() != pImp->nFirstShell )
- bSkip = sal_True;
- }
-
- if ( !bSkip )
- {
-*/
Update_Impl( pCache );
DBG_ASSERT( nCount == pImp->pCaches->Count(),
"Reschedule in StateChanged => buff" );
-// }
}
// skip to next function binding
@@ -1844,9 +1800,6 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
aMsg += " Line: ";
aMsg += ByteString::CreateFromInt32(nLine);
}
-// FILE* pLog = fopen( "c:\\bindings.log", "a+w" );
-// fwrite( aMsg.GetBuffer(), 1, aMsg.Len(), pLog );
-// fclose( pLog );
DbgTrace( aMsg.GetBuffer() );
#endif
@@ -1911,14 +1864,8 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
if ( pImp->bContextChanged )
{
pImp->bContextChanged = FALSE;
- /*
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame
- ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
- if ( xFrame.is() )
- xFrame->contextChanged();*/
}
-#ifndef slow
SfxViewFrame* pFrame = pDispatcher->GetFrame();
// If possible remove unused Caches, for example prepare PlugInInfo
@@ -1937,14 +1884,9 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
pImp->pCaches->Remove(nCache-1, 1);
delete pSfxStateCache;
}
- else
- {
- // new controller to notify the old items
- //!pCache->SetCachedState();
- }
}
}
-#endif
+
// restart background-processing
pImp->nMsgPos = 0;
if ( !pFrame || !pFrame->GetObjectShell() )
@@ -1954,7 +1896,6 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
pImp->aTimer.Stop();
pImp->aTimer.SetTimeout(TIMEOUT_FIRST);
pImp->aTimer.Start();
-// pImp->bFirstRound = sal_True;
}
}
@@ -1972,9 +1913,6 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
aMsg += " Line: ";
aMsg += ByteString::CreateFromInt32(nLine);
}
-// FILE* pLog = fopen( "c:\\bindings.log", "a+w" );
-// fwrite( aMsg.GetBuffer(), 1, aMsg.Len(), pLog );
-// fclose( pLog );
DbgTrace( aMsg.GetBuffer() );
#endif
}
More information about the Libreoffice-commits
mailing list