Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
l10ntools/scripts/localize.pl
l10ntools/source/directory.cxx
l10ntools/source/srciter.cxx
padmin/Executable_spadmin.bin.mk
padmin/Library_spa.mk
svtools/inc/svtools/filter.hxx
svtools/inc/svtools/grfmgr.hxx
svtools/source/filter/filter.cxx
svtools/source/filter/filter2.cxx
svtools/source/filter/wmf/emfwr.cxx
svtools/source/filter/wmf/enhwmf.cxx
svtools/source/filter/wmf/winmtf.cxx
svtools/source/filter/wmf/winmtf.hxx
svtools/source/filter/wmf/winwmf.cxx
svtools/source/filter/wmf/wmfwr.cxx
svtools/source/graphic/grfmgr.cxx
svtools/source/graphic/grfmgr2.cxx
toolkit/source/controls/controlmodelcontainerbase.cxx
toolkit/source/controls/unocontrol.cxx
toolkit/source/helper/formpdfexport.cxx
toolkit/source/helper/unowrapper.cxx
vcl/Package_osx.mk
vcl/aqua/source/app/salinst.cxx
vcl/aqua/source/app/salsys.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/dtrans/test_aquacb.cxx
vcl/aqua/source/res/makefile.mk
vcl/aqua/source/window/salframe.cxx
vcl/aqua/source/window/salframeview.mm
vcl/inc/aqua/salgdi.h
vcl/inc/aqua/salinst.h
vcl/inc/graphite_adaptors.hxx
vcl/inc/graphite_cache.hxx
vcl/inc/graphite_serverfont.hxx
vcl/inc/impprn.hxx
vcl/inc/svdata.hxx
vcl/inc/unx/i18n_status.hxx
vcl/inc/unx/saldata.hxx
vcl/inc/unx/salfont.h
vcl/inc/unx/salinst.h
vcl/inc/unx/salprn.h
vcl/inc/unx/salsys.h
vcl/inc/unx/sm.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/graph.hxx
vcl/inc/vcl/outdev.hxx
vcl/inc/vcl/polyscan.hxx
vcl/inc/vcl/svcompat.hxx
vcl/inc/vcl/svgread.hxx
vcl/inc/vcl/unobrok.hxx
vcl/inc/win/salgdi.h
vcl/inc/win/wincomp.hxx
vcl/prj/d.lst
vcl/source/app/dbggui.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/makefile.mk
vcl/source/app/settings.cxx
vcl/source/app/sound.cxx
vcl/source/app/stdtext.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/app/timer.cxx
vcl/source/app/unohelp.cxx
vcl/source/components/dtranscomp.cxx
vcl/source/control/button.cxx
vcl/source/control/combobox.cxx
vcl/source/control/ctrl.cxx
vcl/source/control/edit.cxx
vcl/source/control/field2.cxx
vcl/source/control/ilstbox.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmapex.cxx
vcl/source/gdi/cvtgrf.cxx
vcl/source/gdi/font.cxx
vcl/source/gdi/image.cxx
vcl/source/gdi/imagerepository.cxx
vcl/source/gdi/impbmp.cxx
vcl/source/gdi/impgraph.cxx
vcl/source/gdi/impimagetree.cxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/makefile.mk
vcl/source/gdi/metaact.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev2.cxx
vcl/source/gdi/outdev5.cxx
vcl/source/gdi/outdev6.cxx
vcl/source/gdi/outmap.cxx
vcl/source/gdi/polyscan.cxx
vcl/source/gdi/print.cxx
vcl/source/gdi/print2.cxx
vcl/source/gdi/region.cxx
vcl/source/gdi/salgdilayout.cxx
vcl/source/gdi/sallayout.cxx
vcl/source/gdi/svcompat.cxx
vcl/source/gdi/virdev.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/gcach_vdev.cxx
vcl/source/glyphs/gcach_vdev.hxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_cache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/glyphs/graphite_serverfont.cxx
vcl/source/glyphs/graphite_textsrc.hxx
vcl/source/glyphs/makefile.mk
vcl/source/src/makefile.mk
vcl/source/window/accel.cxx
vcl/source/window/brdwin.cxx
vcl/source/window/btndlg.cxx
vcl/source/window/dialog.cxx
vcl/source/window/dndevdis.cxx
vcl/source/window/dockmgr.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/floatwin.cxx
vcl/source/window/introwin.cxx
vcl/source/window/keycod.cxx
vcl/source/window/menu.cxx
vcl/source/window/msgbox.cxx
vcl/source/window/scrwnd.cxx
vcl/source/window/split.cxx
vcl/source/window/splitwin.cxx
vcl/source/window/status.cxx
vcl/source/window/syswin.cxx
vcl/source/window/tabpage.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
vcl/source/window/winproc.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/generic/app/i18n_cb.cxx
vcl/unx/generic/app/i18n_ic.cxx
vcl/unx/generic/app/saldata.cxx
vcl/unx/generic/app/saldisp.cxx
vcl/unx/generic/app/salinst.cxx
vcl/unx/generic/app/wmadaptor.cxx
vcl/unx/generic/fontmanager/afm_hash.cpp
vcl/unx/generic/gdi/salbmp.cxx
vcl/unx/generic/gdi/salgdi3.cxx
vcl/unx/generic/gdi/xrender_peer.cxx
vcl/unx/generic/window/salframe.cxx
vcl/unx/generic/window/salobj.cxx
vcl/unx/gtk/a11y/makefile.mk
vcl/unx/gtk/app/gtksys.cxx
vcl/unx/gtk/app/makefile.mk
vcl/unx/gtk/window/gtkframe.cxx
vcl/unx/gtk/window/gtkobject.cxx
vcl/unx/headless/svpinst.cxx
vcl/unx/headless/svpinst.hxx
vcl/unx/headless/svpprn.hxx
vcl/unx/kde/kdedata.cxx
vcl/unx/kde/salnativewidgets-kde.cxx
vcl/unx/kde4/KDESalDisplay.hxx
vcl/unx/kde4/KDEXLib.cxx
vcl/unx/kde4/KDEXLib.hxx
vcl/unx/kde4/VCLKDEApplication.cxx
vcl/unx/kde4/makefile.mk
vcl/unx/source/app/makefile.mk
vcl/unx/source/fontmanager/makefile.mk
vcl/unx/source/gdi/makefile.mk
vcl/unx/source/inc/salcursors.h
vcl/util/linksvp/makefile.mk
vcl/win/source/app/saldata.cxx
vcl/win/source/app/salinst.cxx
vcl/win/source/app/salshl.cxx
vcl/win/source/gdi/makefile.mk
vcl/win/source/gdi/salbmp.cxx
vcl/win/source/gdi/salgdi.cxx
vcl/win/source/gdi/salgdi2.cxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/salgdi_gdiplus.cxx
vcl/win/source/gdi/salprn.cxx
vcl/win/source/gdi/salvd.cxx
vcl/win/source/gdi/winlayout.cxx
vcl/win/source/window/salframe.cxx
vcl/win/source/window/salmenu.cxx
vcl/win/source/window/salobj.cxx

1 files changed, 185 insertions, 0 deletions

diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
new file mode 100644
index 000000000000..6b6bce184770
--- /dev/null
+++ b/vcl/inc/impgraph.hxx
@@ -0,0 +1,185 @@
+/* -*- 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.
+ *
+ ************************************************************************/
+
+#ifndef _SV_IMPGRAPH_HXX
+#define _SV_IMPGRAPH_HXX
+
+#include <tools/urlobj.hxx>
+#include <vcl/bitmap.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/animate.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/rendergraphic.hxx>
+#include <vcl/graph.h>
+
+// ---------------
+// - ImpSwapInfo -
+// ---------------
+
+struct ImpSwapInfo
+{
+    MapMode     maPrefMapMode;
+    Size        maPrefSize;
+};
+
+// --------------
+// - ImpGraphic -
+// --------------
+
+class   OutputDevice;
+class   GfxLink;
+struct  ImpSwapFile;
+class GraphicConversionParameters;
+
+class ImpGraphic
+{
+    friend class Graphic;
+
+private:
+
+    GDIMetaFile         maMetaFile;
+    BitmapEx            maEx;
+    ImpSwapInfo         maSwapInfo;
+    Animation*          mpAnimation;
+    GraphicReader*      mpContext;
+    ImpSwapFile*        mpSwapFile;
+    GfxLink*            mpGfxLink;
+    GraphicType         meType;
+    String              maDocFileURLStr;
+    sal_uLong               mnDocFilePos;
+    mutable sal_uLong       mnSizeBytes;
+    sal_uLong               mnRefCount;
+    sal_Bool                mbSwapOut;
+    sal_Bool                mbSwapUnderway;
+
+private:
+
+                        ImpGraphic();
+                        ImpGraphic( const ImpGraphic& rImpGraphic );
+                        ImpGraphic( const Bitmap& rBmp );
+                        ImpGraphic( const BitmapEx& rBmpEx );
+                        ImpGraphic( const Animation& rAnimation );
+                        ImpGraphic( const GDIMetaFile& rMtf );
+    virtual             ~ImpGraphic();
+
+    ImpGraphic&         operator=( const ImpGraphic& rImpGraphic );
+    sal_Bool                operator==( const ImpGraphic& rImpGraphic ) const;
+    sal_Bool                operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); }
+
+    void                ImplClearGraphics( sal_Bool bCreateSwapInfo );
+    void                ImplClear();
+
+    GraphicType         ImplGetType() const;
+    void                ImplSetDefaultType();
+    sal_Bool                ImplIsSupportedGraphic() const;
+
+    sal_Bool            ImplIsTransparent() const;
+    sal_Bool            ImplIsAlpha() const;
+    sal_Bool            ImplIsAnimated() const;
+    sal_Bool            ImplIsEPS() const;
+    sal_Bool            ImplIsRenderGraphic() const;
+    sal_Bool            ImplHasRenderGraphic() const;
+
+    Bitmap                  ImplGetBitmap(const GraphicConversionParameters& rParameters) const;
+    BitmapEx                ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const;
+    Animation               ImplGetAnimation() const;
+    const GDIMetaFile&      ImplGetGDIMetaFile() const;
+    ::vcl::RenderGraphic    ImplGetRenderGraphic() const;
+
+
+    Size                ImplGetPrefSize() const;
+    void                ImplSetPrefSize( const Size& rPrefSize );
+
+    MapMode             ImplGetPrefMapMode() const;
+    void                ImplSetPrefMapMode( const MapMode& rPrefMapMode );
+
+    sal_uLong               ImplGetSizeBytes() const;
+
+    void                ImplDraw( OutputDevice* pOutDev,
+                                  const Point& rDestPt ) const;
+    void                ImplDraw( OutputDevice* pOutDev,
+                                  const Point& rDestPt,
+                                  const Size& rDestSize ) const;
+
+    void                ImplStartAnimation( OutputDevice* pOutDev,
+                                            const Point& rDestPt,
+                                            long nExtraData = 0,
+                                            OutputDevice* pFirstFrameOutDev = NULL );
+    void                ImplStartAnimation( OutputDevice* pOutDev,
+                                            const Point& rDestPt,
+                                            const Size& rDestSize,
+                                            long nExtraData = 0,
+                                            OutputDevice* pFirstFrameOutDev = NULL );
+    void                ImplStopAnimation( OutputDevice* pOutputDevice = NULL,
+                                           long nExtraData = 0 );
+
+    void                ImplSetAnimationNotifyHdl( const Link& rLink );
+    Link                ImplGetAnimationNotifyHdl() const;
+
+    sal_uLong               ImplGetAnimationLoopCount() const;
+    void                ImplResetAnimationLoopCount();
+
+    List*               ImplGetAnimationInfoList() const;
+
+private:
+
+    GraphicReader*      ImplGetContext();
+    void                ImplSetContext( GraphicReader* pReader );
+
+private:
+
+    void                ImplSetDocFileName( const String& rName, sal_uLong nFilePos );
+    const String&       ImplGetDocFileName() const;
+    sal_uLong               ImplGetDocFilePos() const;
+
+    sal_Bool                ImplReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False );
+    sal_Bool                ImplWriteEmbedded( SvStream& rOStream );
+
+    sal_Bool                ImplSwapIn();
+    sal_Bool                ImplSwapIn( SvStream* pIStm );
+
+    sal_Bool                ImplSwapOut();
+    sal_Bool                ImplSwapOut( SvStream* pOStm );
+
+    sal_Bool                ImplIsSwapOut() const;
+
+    void                ImplSetLink( const GfxLink& );
+    GfxLink             ImplGetLink();
+    sal_Bool                ImplIsLink() const;
+
+    sal_uLong               ImplGetChecksum() const;
+
+    sal_Bool                ImplExportNative( SvStream& rOStm ) const;
+
+    friend SvStream&    operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic );
+    friend SvStream&    operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic );
+};
+
+#endif // _SV_IMPGRAPH_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */