GNOME.org
 

ooo-build r14956 - in trunk: . patches/dev300 patches/vba

Author: kyoshida
Date: Mon Dec 29 20:21:50 2008
New Revision: 14956
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14956&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/vba/vba-userform-geometry-tweak-m37.diff:
	* patches/vba/vba-userform-geometry-tweak.diff:
	* patches/dev300/apply: adjusted for dev300-m38, due to new resources 
	in m38.



Added:
   trunk/patches/vba/vba-userform-geometry-tweak-m37.diff   (props changed)
      - copied unchanged from r14946, /trunk/patches/vba/vba-userform-geometry-tweak.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/vba/vba-userform-geometry-tweak.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec 29 20:21:50 2008
@@ -1834,7 +1834,11 @@
 # fix import sizes and geometry of userforms
 vba-userform-geometry-tweak-m36.diff
 
-[ VBAObjects > dev300-m36 ]
+[ VBAObjects == dev300-m37 ]
+# fix import sizes and geometry of userforms
+vba-userform-geometry-tweak-m37.diff
+
+[ VBAObjects >= dev300-m38 ]
 # fix import sizes and geometry of userforms
 vba-userform-geometry-tweak.diff
 

Modified: trunk/patches/vba/vba-userform-geometry-tweak.diff
==============================================================================
--- trunk/patches/vba/vba-userform-geometry-tweak.diff	(original)
+++ trunk/patches/vba/vba-userform-geometry-tweak.diff	Mon Dec 29 20:21:50 2008
@@ -10,9 +10,9 @@
  
  using namespace comphelper;
  using namespace	::com::sun::star;
-@@ -114,6 +115,14 @@ DialogWindow::DialogWindow( Window* pPar
+@@ -114,6 +115,14 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St
  
- 	pEditor = new DlgEditor();
+ 	pEditor = new DlgEditor( rDocument.getDocument() );
  	pEditor->SetWindow( this );
 +	// set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT )
 +	if ( rDocument.getDocument().is() )
@@ -26,10 +26,10 @@
  
  	// Undo einrichten
 diff --git basctl/source/dlged/dlgedobj.cxx basctl/source/dlged/dlgedobj.cxx
-index bed7bc3..ae7df5c 100644
+index bed7bc3..0899661 100644
 --- basctl/source/dlged/dlgedobj.cxx
 +++ basctl/source/dlged/dlgedobj.cxx
-@@ -77,6 +78,22 @@ TYPEINIT1(DlgEdObj, SdrUnoObj);
+@@ -77,6 +77,22 @@ TYPEINIT1(DlgEdObj, SdrUnoObj);
  DBG_NAME(DlgEdObj);
  
  //----------------------------------------------------------------------------
@@ -52,7 +52,7 @@
  
  DlgEdObj::DlgEdObj()
  		  :SdrUnoObj(String(), sal_False)
-@@ -207,8 +224,9 @@ bool DlgEdObj::TransformSdrToControlCoor
+@@ -207,8 +223,9 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
  	}
      
      // convert pixel to logic units
@@ -64,7 +64,7 @@
  
      // set out parameters
      nXOut = aPos.Width();
-@@ -255,10 +273,10 @@ bool DlgEdObj::TransformSdrToFormCoordin
+@@ -255,10 +272,10 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
  		aSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
  		aSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset;
  	}
@@ -78,7 +78,7 @@
  
      // set out parameters
      nXOut = aPos.Width();
-@@ -300,9 +318,10 @@ bool DlgEdObj::TransformControlToSdrCoor
+@@ -300,9 +317,10 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
      DBG_ASSERT( pDevice, "DlgEdObj::TransformControlToSdrCoordinates: missing default device!" );
      if ( !pDevice )
          return false;
@@ -92,7 +92,7 @@
  
      // add form position
      aPos.Width() += aFormPos.Width();
-@@ -346,14 +365,16 @@ bool DlgEdObj::TransformFormToSdrCoordin
+@@ -346,14 +364,16 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
      DBG_ASSERT( pDevice, "DlgEdObj::TransformFormToSdrCoordinates: missing default device!" );
      if ( !pDevice )
          return false;
@@ -125,7 +125,7 @@
  						   const String &rSubStorageName);
  };
 diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index 1075424..46986eb 100644
+index f773bc4..ea070c6 100644
 --- svx/source/msfilter/msocximex.cxx
 +++ svx/source/msfilter/msocximex.cxx
 @@ -1075,6 +1075,9 @@ sal_Bool OCX_Control::Import(
@@ -138,7 +138,7 @@
      uno::Reference<lang::XMultiServiceFactory>
          xFactory(rDialog, uno::UNO_QUERY);
  
-@@ -1087,11 +1090,15 @@ sal_Bool OCX_Control::Import(uno::Refere
+@@ -1087,11 +1090,15 @@ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog
  	if (!xModel.is())
  		return sal_False;
  
@@ -154,7 +154,7 @@
      }
      catch( uno::Exception& )
      {
-@@ -1107,16 +1114,32 @@ sal_Bool OCX_Control::Import(uno::Refere
+@@ -1107,16 +1114,32 @@ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog
  
      if (!Import(xPropSet))
          return sal_False;
@@ -196,7 +196,7 @@
      if ( msToolTip.Len() > 0 )
      {
  	uno::Any aTmp(&msToolTip,getCppuType((OUString *)0));
-@@ -4321,6 +4344,8 @@ sal_Bool OCX_UserForm::Import(
+@@ -4330,6 +4353,8 @@ sal_Bool OCX_UserForm::Import(
  {
      uno::Reference<beans::XPropertySet>
          xDialogPropSet(mxParent, uno::UNO_QUERY);
@@ -205,7 +205,7 @@
      uno::Any aTmp(&sName,getCppuType((OUString *)0));
      xDialogPropSet->setPropertyValue(
          OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aTmp);
-@@ -4328,11 +4353,32 @@ sal_Bool OCX_UserForm::Import(
+@@ -4337,11 +4362,32 @@ sal_Bool OCX_UserForm::Import(
          OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), aTmp);
      aTmp <<= ImportColor(mnBackColor);
  	xDialogPropSet->setPropertyValue( WW8_ASCII2STR("BackgroundColor"), aTmp);
@@ -243,10 +243,10 @@
      uno::Reference<beans::XPropertySet> xPropSet( mxParent, uno::UNO_QUERY );
      OCX_ContainerControl::Import( xPropSet );
 diff --git svx/source/msfilter/svxmsbas.cxx svx/source/msfilter/svxmsbas.cxx
-index b00e19c..3b2feb0 100644
+index bf3bca5..2a94b6f 100644
 --- svx/source/msfilter/svxmsbas.cxx
 +++ svx/source/msfilter/svxmsbas.cxx
-@@ -89,7 +89,7 @@ int SvxImportMSVBasic::Import( const Str
+@@ -89,7 +89,7 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
  		nRet |= 1;
  
      if (bImport)
@@ -255,7 +255,7 @@
  
  	if( bCopy && CopyStorage_Impl( rStorageName, rSubStorageName ))
  		nRet |= 2;
-@@ -98,7 +98,7 @@ int SvxImportMSVBasic::Import( const Str
+@@ -98,7 +98,7 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
  }
  
  bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
@@ -264,7 +264,7 @@
  {
      SvStorageRef xVBAStg(xRoot->OpenSotStorage(rStorageName,
          STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL));
-@@ -182,7 +182,17 @@ bool SvxImportMSVBasic::ImportForms_Impl
+@@ -182,7 +182,17 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
                      xSF->createInstance(
                         OUString(RTL_CONSTASCII_USTRINGPARAM(
                             "com.sun.star.awt.UnoControlDialogModel"))), uno::UNO_QUERY);
@@ -284,14 +284,14 @@
                  aForm.pDocSh = &rDocSh;
                  sal_Bool bOk = aForm.Read(xTypes);
 diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx
-index db61c94..1abcda6 100644
+index a342099..5b01dd3 100644
 --- toolkit/inc/toolkit/helper/property.hxx
 +++ toolkit/inc/toolkit/helper/property.hxx
-@@ -190,6 +190,7 @@ namespace rtl {
- #define BASEPROPERTY_IMAGE_SCALE_MODE               137
- #define BASEPROPERTY_ENABLEVISIBLE                  138  // sal_Bool
- #define BASEPROPERTY_GROUPNAME                      139  // ::rtl::OUString
-+#define BASEPROPERTY_VBAFORM                        140  // sal_Bool
+@@ -192,6 +192,7 @@ namespace rtl {
+ #define BASEPROPERTY_WRITING_MODE                   138
+ #define BASEPROPERTY_CONTEXT_WRITING_MODE           139
+ #define BASEPROPERTY_GROUPNAME                      140  // ::rtl::OUString
++#define BASEPROPERTY_VBAFORM                        141  // sal_Bool
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
@@ -307,7 +307,7 @@
  using namespace toolkit;
  
  #define PROPERTY_RESOURCERESOLVER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ))
-@@ -289,6 +290,8 @@ UnoControlDialogModel::UnoControlDialogM
+@@ -289,6 +290,8 @@ UnoControlDialogModel::UnoControlDialogModel()
  	aBool <<= (sal_Bool) sal_True;
  	ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
  	ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
@@ -316,7 +316,7 @@
  }
  
  UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rModel )
-@@ -1475,17 +1478,32 @@ void UnoDialogControl::ImplSetPosSize( R
+@@ -1475,17 +1478,32 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
  	xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) >>= nWidth;
  	xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) >>= nHeight;
  
@@ -354,16 +354,16 @@
  		nHeight = aTmp.Height();
  	}
 diff --git toolkit/source/helper/property.cxx toolkit/source/helper/property.cxx
-index a7fc25b..8d1ee74 100644
+index abd26ae..3663c2e 100644
 --- toolkit/source/helper/property.cxx
 +++ toolkit/source/helper/property.cxx
-@@ -271,7 +271,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( 
- 			DECL_PROP_2		( "InvokesStopNodeEditing",	TREE_INVOKESSTOPNODEEDITING, sal_Bool,		BOUND, MAYBEDEFAULT ),
+@@ -273,7 +273,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
              DECL_PROP_2     ( "DialogSourceURL",        DIALOGSOURCEURL,        ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
              DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
--            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,    BOUND, MAYBEDEFAULT )
-+            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,    BOUND, MAYBEDEFAULT ),
-+            DECL_PROP_2     ( "VBAForm",          VBAFORM,          sal_Bool,    BOUND, MAYBEDEFAULT ),
+             DECL_PROP_2     ( "WritingMode",            WRITING_MODE,           sal_Int16,          BOUND, MAYBEDEFAULT ),
+-            DECL_PROP_3     ( "ContextWritingMode",     CONTEXT_WRITING_MODE,   sal_Int16,          BOUND, MAYBEDEFAULT, TRANSIENT )
++            DECL_PROP_3     ( "ContextWritingMode",     CONTEXT_WRITING_MODE,   sal_Int16,          BOUND, MAYBEDEFAULT, TRANSIENT ),
++            DECL_PROP_2     ( "VBAForm",                VBAFORM,                sal_Bool,           BOUND, MAYBEDEFAULT )
              };
  			pPropertyInfos = aImplPropertyInfos;
  			nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
@@ -379,7 +379,7 @@
  
  using namespace ::com::sun::star;
  using namespace ::com::sun::star::uno;
-@@ -1906,9 +1907,14 @@ Reference< xml::sax::XDocumentHandler > 
+@@ -1906,9 +1907,14 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
      Reference< XModel > const & xDocument )
      SAL_THROW( (Exception) )
  {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]