Merge commit 'ooo/DEV300_m106' into integration/dev300_m106

Conflicts:
avmedia/source/gstreamer/gstframegrabber.cxx
avmedia/source/gstreamer/gstplayer.cxx
avmedia/source/gstreamer/gstplayer.hxx
basic/inc/basic/sbxdef.hxx
basic/source/classes/sbxmod.cxx
basic/source/comp/makefile.mk
basic/source/comp/sbcomp.cxx
basic/source/inc/namecont.hxx
basic/source/inc/scriptcont.hxx
basic/source/runtime/methods.cxx
basic/source/runtime/runtime.cxx
basic/source/runtime/stdobj.cxx
basic/source/runtime/step1.cxx
basic/source/uno/namecont.cxx
basic/util/makefile.mk
connectivity/source/commontools/predicateinput.cxx
connectivity/source/drivers/dbase/DNoException.cxx
connectivity/source/drivers/dbase/DTable.cxx
connectivity/source/drivers/file/fcomp.cxx
connectivity/source/drivers/jdbc/JConnection.cxx
connectivity/source/drivers/odbcbase/OResultSet.cxx
connectivity/source/drivers/odbcbase/OStatement.cxx
connectivity/source/parse/sqlnode.cxx
desktop/source/app/app.cxx
drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
drawinglayer/source/processor2d/vclprocessor2d.cxx
formula/inc/formula/token.hxx
formula/source/core/api/token.cxx
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
fpicker/source/win32/filepicker/platform_vista.h
framework/source/helper/persistentwindowstate.cxx
framework/source/uielement/menubarmanager.cxx
oovbaapi/ooo/vba/XFoundFiles.idl
oovbaapi/ooo/vba/excel/XApplication.idl
oovbaapi/ooo/vba/msforms/XCheckBox.idl
oovbaapi/ooo/vba/msforms/XComboBox.idl
oovbaapi/ooo/vba/msforms/XControl.idl
oovbaapi/ooo/vba/msforms/XGroupBox.idl
oovbaapi/ooo/vba/msforms/XLabel.idl
oovbaapi/ooo/vba/msforms/XListBox.idl
oovbaapi/ooo/vba/msforms/XNewFont.idl
oovbaapi/ooo/vba/msforms/XRadioButton.idl
oovbaapi/ooo/vba/msforms/XTextBox.idl
oovbaapi/ooo/vba/msforms/XToggleButton.idl
scripting/source/dlgprov/dlgevtatt.cxx
sfx2/source/control/unoctitm.cxx
sfx2/source/doc/objstor.cxx
sfx2/source/doc/objxtor.cxx
svx/inc/svx/svdograf.hxx
svx/source/form/fmpage.cxx
svx/source/form/fmpgeimp.cxx
svx/source/svdraw/svdedtv.cxx
svx/source/svdraw/svdfmtf.cxx
svx/source/svdraw/svdograf.cxx
svx/source/svdraw/svdouno.cxx
svx/source/xml/xmlgrhlp.cxx
uui/source/iahndl-ssl.cxx
vbahelper/Library_msforms.mk
vbahelper/Library_vbahelper.mk
vbahelper/inc/vbahelper/vbahelper.hxx
vbahelper/prj/build.lst
vbahelper/source/msforms/vbacombobox.cxx
vbahelper/source/msforms/vbacontrol.cxx
vbahelper/source/msforms/vbacontrols.cxx
vbahelper/source/msforms/vbaframe.cxx
vbahelper/source/msforms/vbaframe.hxx
vbahelper/source/msforms/vbalabel.cxx
vbahelper/source/msforms/vbalabel.hxx
vbahelper/source/msforms/vbalistbox.cxx
vbahelper/source/msforms/vbalistbox.hxx
vbahelper/source/msforms/vbamultipage.cxx
vbahelper/source/msforms/vbatogglebutton.cxx
vbahelper/source/msforms/vbauserform.cxx
vbahelper/source/vbahelper/vbacommandbar.cxx
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
vbahelper/source/vbahelper/vbahelper.cxx
vbahelper/source/vbahelper/vbawindowbase.cxx
xmloff/source/meta/xmlmetai.cxx
xmloff/source/style/PageMasterExportPropMapper.cxx
xmloff/source/style/PageMasterStyleMap.cxx
xmloff/source/text/txtexppr.cxx
xmloff/source/text/txtprmap.cxx

3 files changed, 132 insertions, 90 deletions

diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 169ec68b6698..22aba3a67289 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -31,6 +31,9 @@
 #include <tools/debug.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <com/sun/star/table/BorderLine2.hpp>
+
+#include "txtexppr.hxx"
+
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
@@ -38,7 +41,10 @@
 #include <com/sun/star/awt/FontPitch.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
-#include "txtexppr.hxx"
+
+#include <tools/debug.hxx>
+
+#include <xmloff/txtprmap.hxx>
 #include <xmloff/xmlexp.hxx>
 #include "XMLSectionFootnoteConfigExport.hxx"
 
@@ -303,6 +309,26 @@ void XMLTextExportPropertySetMapper::ContextFontHeightFilter(
 // helper method; implementation below
 bool lcl_IsOutlineStyle(const SvXMLExport&, const OUString&);
 
+static void
+lcl_checkMultiProperty(XMLPropertyState *const pState,
+                       XMLPropertyState *const pRelState)
+{
+    if (pState && pRelState)
+    {
+        sal_Int32 nTemp = 0;
+        pRelState->maValue >>= nTemp;
+        if (100 == nTemp)
+        {
+            pRelState->mnIndex = -1;
+            pRelState->maValue.clear();
+        }
+        else
+        {
+            pState->mnIndex = -1;
+            pState->maValue.clear();
+        }
+    }
+}
 
 void XMLTextExportPropertySetMapper::ContextFilter(
     ::std::vector< XMLPropertyState >& rProperties,
@@ -443,6 +469,9 @@ void XMLTextExportPropertySetMapper::ContextFilter(
     XMLPropertyState* pClip11State = NULL;
     XMLPropertyState* pClipState = NULL;
 
+    XMLPropertyState* pAllParaMargin = NULL;
+    XMLPropertyState* pAllMargin = NULL;
+
     sal_Bool bNeedsAnchor = sal_False;
 
     for( ::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin();
@@ -557,6 +586,8 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         case CTF_NUMBERINGSTYLENAME:    pListStyleName = propertie; break;
         case CTF_TEXT_CLIP11:           pClip11State = propertie; break;
         case CTF_TEXT_CLIP:             pClipState = propertie; break;
+        case CTF_PARAMARGINALL:         pAllParaMargin = propertie; break;
+        case CTF_MARGINALL:             pAllMargin = propertie; break;
         }
     }
 
@@ -602,87 +633,21 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         }
     }
 
-    if( pParaLeftMarginState && pParaLeftMarginRelState )
-    {
-        sal_Int32 nTemp = 0;
-        pParaLeftMarginRelState->maValue >>= nTemp;
-        if( nTemp == 100 )
-        {
-            pParaLeftMarginRelState->mnIndex = -1;
-            pParaLeftMarginRelState->maValue.clear();
-        }
-        else
-        {
-            pParaLeftMarginState->mnIndex = -1;
-            pParaLeftMarginState->maValue.clear();
-        }
-
-    }
-
-    if( pParaRightMarginState && pParaRightMarginRelState )
-    {
-        sal_Int32 nTemp = 0;
-        pParaRightMarginRelState->maValue >>= nTemp;
-        if( nTemp == 100 )
-        {
-            pParaRightMarginRelState->mnIndex = -1;
-            pParaRightMarginRelState->maValue.clear();
-        }
-        else
-        {
-            pParaRightMarginState->mnIndex = -1;
-            pParaRightMarginState->maValue.clear();
-        }
-    }
-
-    if( pParaFirstLineState && pParaFirstLineRelState )
-    {
-        sal_Int32 nTemp = 0;
-        pParaFirstLineRelState->maValue >>= nTemp;
-        if( nTemp == 100 )
-        {
-            pParaFirstLineRelState->mnIndex = -1;
-            pParaFirstLineRelState->maValue.clear();
-        }
-        else
-        {
-            pParaFirstLineState->mnIndex = -1;
-            pParaFirstLineState->maValue.clear();
-        }
-    }
+    lcl_checkMultiProperty(pParaLeftMarginState, pParaLeftMarginRelState);
+    lcl_checkMultiProperty(pParaRightMarginState, pParaRightMarginRelState);
+    lcl_checkMultiProperty(pParaTopMarginState, pParaTopMarginRelState);
+    lcl_checkMultiProperty(pParaBottomMarginState, pParaBottomMarginRelState);
+    lcl_checkMultiProperty(pParaFirstLineState, pParaFirstLineRelState);
 
-    if( pParaTopMarginState && pParaTopMarginRelState )
+    if (pAllParaMargin)
     {
-        sal_Int32 nTemp = 0;
-        pParaTopMarginRelState->maValue >>= nTemp;
-        if( nTemp == 100 )
-        {
-            pParaTopMarginRelState->mnIndex = -1;
-            pParaTopMarginRelState->maValue.clear();
-        }
-        else
-        {
-            pParaTopMarginState->mnIndex = -1;
-            pParaTopMarginState->maValue.clear();
-        }
-
+        pAllParaMargin->mnIndex = -1; // just export individual attributes...
+        pAllParaMargin->maValue.clear();
     }
-
-    if( pParaBottomMarginState && pParaBottomMarginRelState )
+    if (pAllMargin)
     {
-        sal_Int32 nTemp = 0;
-        pParaBottomMarginRelState->maValue >>= nTemp;
-        if( nTemp == 100 )
-        {
-            pParaBottomMarginRelState->mnIndex = -1;
-            pParaBottomMarginRelState->maValue.clear();
-        }
-        else
-        {
-            pParaBottomMarginState->mnIndex = -1;
-            pParaBottomMarginState->maValue.clear();
-        }
-
+        pAllMargin->mnIndex = -1; // just export individual attributes...
+        pAllMargin->maValue.clear();
     }
 
     if( pAllBorderWidthState )
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 6a16693078e2..342291d703f4 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -316,7 +316,12 @@ void XMLTextImportPropertyMapper::finished(
     XMLPropertyState* pVertOrientRelAsChar = 0;
     XMLPropertyState* pBackTransparency = NULL; // transparency in %
     XMLPropertyState* pBackTransparent = NULL;  // transparency as boolean
-    sal_uInt16 i; // for the "for" loop
+    XMLPropertyState* pAllParaMargin = 0;
+    XMLPropertyState* pParaMargins[4] = { 0, 0, 0, 0 };
+    ::std::auto_ptr<XMLPropertyState> pNewParaMargins[4];
+    XMLPropertyState* pAllMargin = 0;
+    XMLPropertyState* pMargins[4] = { 0, 0, 0, 0 };
+    ::std::auto_ptr<XMLPropertyState> pNewMargins[4];
 
     for( ::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin();
          aIter != rProperties.end();
@@ -384,7 +389,31 @@ void XMLTextImportPropertyMapper::finished(
                                         bHasAnyWidth = sal_True; break;
         case CTF_BACKGROUND_TRANSPARENCY: pBackTransparency = property; break;
         case CTF_BACKGROUND_TRANSPARENT:  pBackTransparent = property; break;
-
+        case CTF_PARAMARGINALL:
+        case CTF_PARAMARGINALL_REL:
+                pAllParaMargin = property; break;
+        case CTF_PARALEFTMARGIN:
+        case CTF_PARALEFTMARGIN_REL:
+                pParaMargins[XML_LINE_LEFT] = property; break;
+        case CTF_PARARIGHTMARGIN:
+        case CTF_PARARIGHTMARGIN_REL:
+                pParaMargins[XML_LINE_RIGHT] = property; break;
+        case CTF_PARATOPMARGIN:
+        case CTF_PARATOPMARGIN_REL:
+                pParaMargins[XML_LINE_TOP] = property; break;
+        case CTF_PARABOTTOMMARGIN:
+        case CTF_PARABOTTOMMARGIN_REL:
+                pParaMargins[XML_LINE_BOTTOM] = property; break;
+        case CTF_MARGINALL:
+                pAllMargin = property; break;
+        case CTF_MARGINLEFT:
+                pMargins[XML_LINE_LEFT] = property; break;
+        case CTF_MARGINRIGHT:
+                pMargins[XML_LINE_RIGHT] = property; break;
+        case CTF_MARGINTOP:
+                pMargins[XML_LINE_TOP] = property; break;
+        case CTF_MARGINBOTTOM:
+                pMargins[XML_LINE_BOTTOM] = property; break;
         }
     }
 
@@ -401,8 +430,31 @@ void XMLTextImportPropertyMapper::finished(
         FontFinished( pFontFamilyNameCTL, pFontStyleNameCTL, pFontFamilyCTL,
                       pFontPitchCTL, pFontCharSetCTL );
 
-    for( i = 0; i < 4; i++ )
+    for (sal_uInt16 i = 0; i < 4; i++)
     {
+        if (pAllParaMargin && !pParaMargins[i])
+        {
+#ifdef DBG_UTIL
+            sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
+                                        pAllParaMargin->mnIndex + (2*i) + 2 );
+            OSL_ENSURE( nTmp >= CTF_PARALEFTMARGIN &&
+                        nTmp <= CTF_PARABOTTOMMARGIN_REL,
+                        "wrong property context id" );
+#endif
+            pNewParaMargins[i].reset(new XMLPropertyState(
+                pAllParaMargin->mnIndex + (2*i) + 2, pAllParaMargin->maValue));
+        }
+        if (pAllMargin && !pMargins[i])
+        {
+#ifdef DBG_UTIL
+            sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
+                                        pAllMargin->mnIndex + i + 1 );
+            OSL_ENSURE( nTmp >= CTF_MARGINLEFT && nTmp <= CTF_MARGINBOTTOM,
+                        "wrong property context id" );
+#endif
+            pNewMargins[i].reset(new XMLPropertyState(
+                pAllMargin->mnIndex + i + 1, pAllMargin->maValue));
+        }
         if( pAllBorderDistance && !pBorderDistances[i] )
         {
 #ifdef DBG_UTIL
@@ -450,6 +502,16 @@ void XMLTextImportPropertyMapper::finished(
             pBorders[i]->maValue <<= aBorderLine;
         }
     }
+
+    if (pAllParaMargin)
+    {
+        pAllParaMargin->mnIndex = -1;
+    }
+    if (pAllMargin)
+    {
+        pAllMargin->mnIndex = -1;
+    }
+
     if( pAllBorderDistance )
         pAllBorderDistance->mnIndex = -1;
 
@@ -593,8 +655,16 @@ void XMLTextImportPropertyMapper::finished(
         delete pNewFontCharSetCTL;
     }
 
-    for( i=0; i<4; i++ )
+    for (sal_uInt16 i=0; i<4; i++)
     {
+        if (pNewParaMargins[i].get())
+        {
+            rProperties.push_back(*pNewParaMargins[i]);
+        }
+        if (pNewMargins[i].get())
+        {
+            rProperties.push_back(*pNewMargins[i]);
+        }
         if( pNewBorderDistances[i] )
         {
             rProperties.push_back( *pNewBorderDistances[i] );
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index d3b5311cfc84..2409a6493d16 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -28,11 +28,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
+
+#include <xmloff/txtprmap.hxx>
+
 #include <tools/debug.hxx>
-#include "xmloff/xmlnmspe.hxx"
+
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include "txtprhdl.hxx"
-#include <xmloff/txtprmap.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -88,6 +91,9 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
     // RES_UNKNOWNATR_CONTAINER
     MP_E( "ParaUserDefinedAttributes", TEXT, XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
     // RES_LR_SPACE
+    // !!! DO NOT REORDER THE MARGINS !!!
+    MP_E( "ParaLeftMargin",         FO, MARGIN,     XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARAMARGINALL ),
+    MP_E( "ParaLeftMarginRelative", FO, MARGIN,     XML_TYPE_PERCENT16, CTF_PARAMARGINALL_REL ),
     MP_E( "ParaLeftMargin",         FO, MARGIN_LEFT,        XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARALEFTMARGIN ),
     MP_E( "ParaLeftMarginRelative", FO, MARGIN_LEFT,        XML_TYPE_PERCENT16, CTF_PARALEFTMARGIN_REL ),
     MP_E( "ParaRightMargin",            FO, MARGIN_RIGHT,       XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARARIGHTMARGIN ),
@@ -575,11 +581,12 @@ XMLPropertyMapEntry aXMLFramePropMap[] =
     MG_ED( "VertOrientPosition",    SVG,    Y,        XML_TYPE_MEASURE, 0 ),
     // ***** The map for automatic styles starts here *****
     // RES_LR_SPACE
-    MG_E( "LeftMargin",             FO, MARGIN_LEFT,        XML_TYPE_MEASURE,  0),
-    MG_E( "RightMargin",                FO, MARGIN_RIGHT,       XML_TYPE_MEASURE, 0 ),
+    MG_E( "LeftMargin",             FO, MARGIN,     XML_TYPE_MEASURE,  CTF_MARGINALL ),
+    MG_E( "LeftMargin",             FO, MARGIN_LEFT,        XML_TYPE_MEASURE,  CTF_MARGINLEFT ),
+    MG_E( "RightMargin",                FO, MARGIN_RIGHT,       XML_TYPE_MEASURE, CTF_MARGINRIGHT ),
     // RES_UL_SPACE
-    MG_E( "TopMargin",              FO, MARGIN_TOP,         XML_TYPE_MEASURE, 0 ),
-    MG_E( "BottomMargin",           FO, MARGIN_BOTTOM,      XML_TYPE_MEASURE, 0 ),
+    MG_E( "TopMargin",              FO, MARGIN_TOP,         XML_TYPE_MEASURE, CTF_MARGINTOP ),
+    MG_E( "BottomMargin",           FO, MARGIN_BOTTOM,      XML_TYPE_MEASURE, CTF_MARGINBOTTOM ),
     // RES_PAGEDESC
     // not required
     // RES_BREAK
@@ -844,7 +851,7 @@ XMLPropertyMapEntry *lcl_txtprmap_getMap( sal_uInt16 nType )
         break;
     case TEXT_PROP_MAP_SHAPE_PARA:
         pMap = &(aXMLParaPropMap[1]);
-        DBG_ASSERT( pMap->meXMLName == XML_MARGIN_LEFT, "shape para map changed" );
+        OSL_ENSURE( pMap->meXMLName == XML_MARGIN, "shape para map changed" );
         break;
     case TEXT_PROP_MAP_PARA:
         pMap = aXMLParaPropMap;
@@ -854,7 +861,7 @@ XMLPropertyMapEntry *lcl_txtprmap_getMap( sal_uInt16 nType )
         break;
     case TEXT_PROP_MAP_AUTO_FRAME:
         pMap = &(aXMLFramePropMap[13]);
-        DBG_ASSERT( pMap->meXMLName == XML_MARGIN_LEFT, "frame map changed" );
+        OSL_ENSURE( pMap->meXMLName == XML_MARGIN, "frame map changed" );
         break;
     case TEXT_PROP_MAP_SHAPE:
         pMap = aXMLShapePropMap;