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, 303 insertions, 0 deletions

diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
new file mode 100644
index 000000000000..51c6bcf7e73e
--- /dev/null
+++ b/vcl/inc/salframe.hxx
@@ -0,0 +1,303 @@
+/* -*- 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_SALFRAME_HXX
+#define _SV_SALFRAME_HXX
+
+#include <vcl/sv.h>
+#include <vcl/dllapi.h>
+
+#ifdef __cplusplus
+
+#include <vcl/ptrstyle.hxx>
+#include <vcl/sndstyle.hxx>
+
+#endif // __cplusplus
+#include <salwtype.hxx>
+#include <salgeom.hxx>
+#include <tools/gen.hxx>
+#include <vcl/region.hxx>
+
+#include <vcl/impdel.hxx>
+#include <rtl/ustring.hxx>
+#include <vcl/keycod.hxx>
+
+class AllSettings;
+class SalGraphics;
+class SalBitmap;
+class SalMenu;
+class Window;
+
+
+struct SalFrameState;
+struct SalInputContext;
+struct SystemEnvData;
+
+// -----------------
+// - SalFrameTypes -
+// -----------------
+
+#define SAL_FRAME_TOTOP_RESTOREWHENMIN      ((sal_uInt16)0x0001)
+#define SAL_FRAME_TOTOP_FOREGROUNDTASK      ((sal_uInt16)0x0002)
+#define SAL_FRAME_TOTOP_GRABFOCUS           ((sal_uInt16)0x0004)
+#define SAL_FRAME_TOTOP_GRABFOCUS_ONLY       ((sal_uInt16)0x0008)
+
+#define SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE  ((sal_uInt16)0x0001)
+#define SAL_FRAME_ENDEXTTEXTINPUT_CANCEL    ((sal_uInt16)0x0002)
+
+
+// -----------------
+// - SalFrameStyle -
+// -----------------
+
+#define SAL_FRAME_STYLE_DEFAULT             ((sal_uLong)0x00000001)
+#define SAL_FRAME_STYLE_MOVEABLE            ((sal_uLong)0x00000002)
+#define SAL_FRAME_STYLE_SIZEABLE            ((sal_uLong)0x00000004)
+#define SAL_FRAME_STYLE_CLOSEABLE           ((sal_uLong)0x00000008)
+
+// no shadow effect on WindowsXP
+#define SAL_FRAME_STYLE_NOSHADOW            ((sal_uLong)0x00000010)
+// indicate tooltip windows, so they can always be topmost
+#define SAL_FRAME_STYLE_TOOLTIP             ((sal_uLong)0x00000020)
+// windows without windowmanager decoration, this typically only applies to floating windows
+#define SAL_FRAME_STYLE_OWNERDRAWDECORATION ((sal_uLong)0x00000040)
+// dialogs
+#define SAL_FRAME_STYLE_DIALOG              ((sal_uLong)0x00000080)
+// partial fullscreen: fullscreen on one monitor of a multimonitor display
+#define SAL_FRAME_STYLE_PARTIAL_FULLSCREEN  ((sal_uLong)0x00800000)
+// plugged system child window
+#define SAL_FRAME_STYLE_PLUG                ((sal_uLong)0x10000000)
+// system child window inside another SalFrame
+#define SAL_FRAME_STYLE_SYSTEMCHILD         ((sal_uLong)0x08000000)
+// floating window
+#define SAL_FRAME_STYLE_FLOAT               ((sal_uLong)0x20000000)
+// floating window that needs to be focusable
+#define SAL_FRAME_STYLE_FLOAT_FOCUSABLE     ((sal_uLong)0x04000000)
+// toolwindows should be painted with a smaller decoration
+#define SAL_FRAME_STYLE_TOOLWINDOW          ((sal_uLong)0x40000000)
+// the window containing the intro bitmap, aka splashscreen
+#define SAL_FRAME_STYLE_INTRO               ((sal_uLong)0x80000000)
+
+/*
+#define SAL_FRAME_STYLE_MINABLE             ((sal_uLong)0x00000008)
+#define SAL_FRAME_STYLE_MAXABLE             ((sal_uLong)0x00000010)
+#define SAL_FRAME_STYLE_BORDER              ((sal_uLong)0x00000040)
+#define SAL_FRAME_STYLE_DOC                 ((sal_uLong)0x00004000)
+#define SAL_FRAME_STYLE_DIALOG              ((sal_uLong)0x00008000)
+#define SAL_FRAME_STYLE_TOOL                ((sal_uLong)0x00010000)
+#define SAL_FRAME_STYLE_FULLSIZE            ((sal_uLong)0x00020000)
+*/
+
+// ----------------------------------------
+// - extended frame style                 -
+// - (sal equivalent to extended WinBits) -
+// ----------------------------------------
+typedef sal_uInt64 SalExtStyle;
+#define SAL_FRAME_EXT_STYLE_DOCUMENT        SalExtStyle(0x00000001)
+#define SAL_FRAME_EXT_STYLE_DOCMODIFIED     SalExtStyle(0x00000002)
+
+// ------------------------
+// - Flags for SetPosSize -
+// ------------------------
+
+#define SAL_FRAME_POSSIZE_X                 ((sal_uInt16)0x0001)
+#define SAL_FRAME_POSSIZE_Y                 ((sal_uInt16)0x0002)
+#define SAL_FRAME_POSSIZE_WIDTH             ((sal_uInt16)0x0004)
+#define SAL_FRAME_POSSIZE_HEIGHT            ((sal_uInt16)0x0008)
+
+#ifdef __cplusplus
+
+using ::rtl::OUString;
+using ::rtl::OString;
+
+// ------------
+// - SalFrame -
+// ------------
+
+struct SystemParentData;
+
+class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier
+{
+    // the VCL window corresponding to this frame
+    Window*                 m_pWindow;
+    SALFRAMEPROC            m_pProc;
+public:                     // public for Sal Implementation
+    SalFrame() : m_pWindow( NULL ), m_pProc( NULL ) {}
+    virtual ~SalFrame();
+
+public:                     // public for Sal Implementation
+    SalFrameGeometry        maGeometry;
+
+public:
+    // SalGraphics or NULL, but two Graphics for all SalFrames
+    // must be returned
+    virtual SalGraphics*        GetGraphics() = 0;
+    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) = 0;
+
+    // Event must be destroyed, when Frame is destroyed
+    // When Event is called, SalInstance::Yield() must be returned
+    virtual sal_Bool                PostEvent( void* pData ) = 0;
+
+    virtual void                SetTitle( const XubString& rTitle ) = 0;
+    virtual void                SetIcon( sal_uInt16 nIcon ) = 0;
+    virtual void                SetRepresentedURL( const rtl::OUString& );
+    virtual void                    SetMenu( SalMenu *pSalMenu ) = 0;
+    virtual void                    DrawMenuBar() = 0;
+
+    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) = 0;
+
+    // Before the window is visible, a resize event
+    // must be sent with the correct size
+    virtual void                Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ) = 0;
+    virtual void                Enable( sal_Bool bEnable ) = 0;
+    // Set ClientSize and Center the Window to the desktop
+    // and send/post a resize message
+    virtual void                SetMinClientSize( long nWidth, long nHeight ) = 0;
+    virtual void                SetMaxClientSize( long nWidth, long nHeight ) = 0;
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) = 0;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) = 0;
+    virtual void                GetWorkArea( Rectangle& rRect ) = 0;
+    virtual SalFrame*           GetParent() const = 0;
+    // Note: x will be mirrored at parent if UI mirroring is active
+    SalFrameGeometry            GetGeometry();
+    const SalFrameGeometry&     GetUnmirroredGeometry() const { return maGeometry; }
+    virtual void                SetWindowState( const SalFrameState* pState ) = 0;
+    virtual sal_Bool                GetWindowState( SalFrameState* pState ) = 0;
+    virtual void                ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ) = 0;
+    // Enable/Disable ScreenSaver, SystemAgents, ...
+    virtual void                StartPresentation( sal_Bool bStart ) = 0;
+    // Show Window over all other Windows
+    virtual void                SetAlwaysOnTop( sal_Bool bOnTop ) = 0;
+
+    // Window to top and grab focus
+    virtual void                ToTop( sal_uInt16 nFlags ) = 0;
+
+    // this function can call with the same
+    // pointer style
+    virtual void                SetPointer( PointerStyle ePointerStyle ) = 0;
+    virtual void                CaptureMouse( sal_Bool bMouse ) = 0;
+    virtual void                SetPointerPos( long nX, long nY ) = 0;
+
+    // flush output buffer
+    virtual void                Flush( void) = 0;
+    virtual void                Flush( const Rectangle& );
+    // flush output buffer, wait till outstanding operations are done
+    virtual void                Sync() = 0;
+
+    virtual void                SetInputContext( SalInputContext* pContext ) = 0;
+    virtual void                EndExtTextInput( sal_uInt16 nFlags ) = 0;
+
+    virtual String              GetKeyName( sal_uInt16 nKeyCode ) = 0;
+    virtual String              GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode ) = 0;
+
+    // returns in 'rKeyCode' the single keycode that translates to the given unicode when using a keyboard layout of language 'aLangType'
+    // returns sal_False if no mapping exists or function not supported
+    // this is required for advanced menu support
+    virtual sal_Bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) = 0;
+
+    // returns the input language used for the last key stroke
+    // may be LANGUAGE_DONTKNOW if not supported by the OS
+    virtual LanguageType        GetInputLanguage() = 0;
+
+    virtual SalBitmap*          SnapShot() = 0;
+
+    virtual void                UpdateSettings( AllSettings& rSettings ) = 0;
+
+    virtual void                Beep( SoundType eSoundType ) = 0;
+
+    // returns system data (most prominent: window handle)
+    virtual const SystemEnvData*    GetSystemData() const = 0;
+
+    // sets a background bitmap on the frame; the implementation
+    // must not make assumptions about the lifetime of the passed SalBitmap
+    // but should copy its contents to an own buffer
+    virtual void                SetBackgroundBitmap( SalBitmap* ) = 0;
+
+
+    // get current modifier, button mask and mouse position
+    struct SalPointerState
+    {
+        sal_uLong   mnState;
+        Point   maPos;      // in frame coordinates
+    };
+
+    virtual SalPointerState     GetPointerState() = 0;
+
+    struct SalIndicatorState
+    {
+        sal_uInt16  mnState;
+    };
+
+    virtual SalIndicatorState   GetIndicatorState() = 0;
+
+    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) = 0;
+
+    // set new parent window
+    virtual void                SetParent( SalFrame* pNewParent ) = 0;
+    // reparent window to act as a plugin; implementation
+    // may choose to use a new system window inetrnally
+    // return false to indicate failure
+    virtual bool                SetPluginParent( SystemParentData* pNewParent ) = 0;
+
+    // move the frame to a new screen
+    virtual void                SetScreenNumber( unsigned int nScreen ) = 0;
+
+    virtual void                SetApplicationID( const rtl::OUString &rApplicationID) = 0;
+
+    // shaped system windows
+    // set clip region to none (-> rectangular windows, normal state)
+    virtual void                    ResetClipRegion() = 0;
+    // start setting the clipregion consisting of nRects rectangles
+    virtual void                    BeginSetClipRegion( sal_uLong nRects ) = 0;
+    // add a rectangle to the clip region
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0;
+    // done setting up the clipregion
+    virtual void                    EndSetClipRegion() = 0;
+
+    // Callbacks (indepent part in vcl/source/window/winproc.cxx)
+    // for default message handling return 0
+    void                        SetCallback( Window* pWindow, SALFRAMEPROC pProc )
+    { m_pWindow = pWindow; m_pProc = pProc; }
+
+    // returns the instance set
+    Window*                       GetWindow() const { return m_pWindow; }
+
+    // Call the callback set; this sometimes necessary for implementation classes
+    // that should not now more than necessary about the SalFrame implementation
+    // (e.g. input methods, printer update handlers).
+    long                        CallCallback( sal_uInt16 nEvent, const void* pEvent ) const
+    { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
+};
+
+
+
+#endif // __cplusplus
+
+#endif // _SV_SALFRAME_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */