Commits

Anonymous committed 5fa8e5d Merge

swbookmarkfixes01: merge DEV300_m98

Comments (0)

Files changed (1120)

 f429027dae12ecc8b3fa76d5517525e29fb07ca0 OOO330_m16
 12b46f9bb0ec4dafb42b3bec984c096dc9209374 OOO330_m17
 41b0797e09ed77cf6b719fe7c39119d682d24749 DEV300_m95
-8650e94f45129904b7dcb52e6519d0fb4a3c894d OOO330_m18
+8650e94f45129904b7dcb52e6519d0fb4a3c894d OOO330_m18
+41e86e55f8a9f2179f3d1fc1741116280d7a54e1 DEV300_m96
+19d9ebadebea40835d874a702fd86c8281d4cd52 DEV300_m97
+4b862a2efe512227164230653878e2cd029c0569 DEV300_m98

RepositoryFixes.mk

 
 
 ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
+else
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
+endif
+gb_Library_NOILIBFILENAMES:=\
+	icuuc \
+	sot \
+	uwinapi \
+
+gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+
+gb_Library_ILIBFILENAMES:=\
+	unicows \
+	uuid \
+
+gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
+
+gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp4%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+else
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
 
 endif
 
+endif
+
 ifeq ($(OS),SOLARIS)
 gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
 endif
 
 # vim: set noet sw=4 ts=4:
-

accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx

 #include "accessibility/extended/accessiblebrowseboxcell.hxx"
 #endif
 #include <cppuhelper/implbase2.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 // ============================================================================
 namespace accessibility
 {

accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx

 
 #include <tools/gen.hxx>
 #include <tools/string.hxx>
-#include <vcl/wintypes.hxx>
-#include <tools/gen.hxx>
+#include <tools/wintypes.hxx>
 
 namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
     class XClipboard;

automation/source/server/statemnt.cxx

 #include <comphelper/processfactory.hxx>
 #include <comphelper/uieventslogger.hxx>
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
 #endif
 #include <vcl/fixed.hxx>
 #include <vcl/wrkwin.hxx>
 #include <osl/diagnose.h>
-#include <vcl/wintypes.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/roadmap.hxx>
 #include <svtools/table/tablecontrol.hxx>

automation/source/server/statemnt.hxx

 #ifndef _STATEMNT_HXX
 #define _STATEMNT_HXX
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <tools/string.hxx>
 #include <tools/debug.hxx>
 #include <tools/time.hxx>

basctl/source/basicide/basicprint.src

     {
         < "Print range"; >;
         < "All ~Pages"; >;
-        < "Print all pages of the printable content."; >;
         < "Pa~ges"; >;
-        < "Print only some pages of the printable content."; >;
     };
 };

basctl/source/basicide/basicrenderable.cxx

 , mpWindow( pWin )
 {
     ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST )  );
-    DBG_ASSERT( aStrings.Count() >= 5, "resource incomplete" );
-    if( aStrings.Count() < 5 ) // bad resource ?
+    DBG_ASSERT( aStrings.Count() >= 3, "resource incomplete" );
+    if( aStrings.Count() < 3 ) // bad resource ?
         return;
 
     m_aUIProperties.realloc( 3 );
     // create a choice for the range to print
     rtl::OUString aPrintContentName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) );
     Sequence< rtl::OUString > aChoices( 2 );
-    Sequence< rtl::OUString > aHelpTexts( 2 );
+    Sequence< rtl::OUString > aHelpIds( 2 );
     aChoices[0] = aStrings.GetString( 1 );
-    aHelpTexts[0] = aStrings.GetString( 2 );
-    aChoices[1] = aStrings.GetString( 3 );
-    aHelpTexts[1] = aStrings.GetString( 4 );
+    aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) );
+    aChoices[1] = aStrings.GetString( 2 );
+    aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) );
     m_aUIProperties[1].Value = getChoiceControlOpt( rtl::OUString(),
-                                                    aHelpTexts,
+                                                    aHelpIds,
                                                     aPrintContentName,
                                                     aChoices,
                                                     0 );

basic/inc/pch/precompiled_basic.hxx

 #include "vcl/timer.hxx"
 #include "vcl/toolbox.hxx"
 #include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "vcl/wrkwin.hxx"
 
 #include "vos/diagnose.hxx"

basic/source/basmgr/basicmanagerrepository.cxx

 
         // register as listener for the BasicManager being destroyed
         StartListening( *_out_rpBasicManager );
+
+        // #i104876: Library container must not be modified just after
+        // creation. This happens as side effect when creating default
+        // "Standard" libraries and needs to be corrected here
+        xBasicLibs->setModified( sal_False );
+        xDialogLibs->setModified( sal_False );
+
     }
 
     //--------------------------------------------------------------------

basic/source/classes/sbunoobj.cxx

 	return sbxToUnoValueImpl( pVar );
 }
 
+
+// Funktion, um einen globalen Bezeichner im
+// UnoScope zu suchen und fuer Sbx zu wrappen
+static bool implGetTypeByName( const String& rName, Type& rRetType )
+{
+	bool bSuccess = false;
+
+    Reference< XHierarchicalNameAccess > xTypeAccess = getTypeProvider_Impl();
+    if( xTypeAccess->hasByHierarchicalName( rName ) )
+    {
+        Any aRet = xTypeAccess->getByHierarchicalName( rName );
+		Reference< XTypeDescription > xTypeDesc;
+		aRet >>= xTypeDesc;
+
+        if( xTypeDesc.is() )
+        {
+			rRetType = Type( xTypeDesc->getTypeClass(), xTypeDesc->getName() );
+			bSuccess = true;
+        }
+    }
+	return bSuccess;
+}
+
+
 // Konvertierung von Sbx nach Uno mit bekannter Zielklasse
 Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty )
 {
 		}
 		break;
 
+		case TypeClass_TYPE:
+		{
+			if( eBaseType == SbxOBJECT )
+			{
+				// XIdlClass?
+				Reference< XIdlClass > xIdlClass;
+
+				SbxBaseRef pObj = (SbxBase*)pVar->GetObject();
+				if( pObj && pObj->ISA(SbUnoObject) )
+				{
+					Any aUnoAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
+					aUnoAny >>= xIdlClass;
+				}
+
+				if( xIdlClass.is() )
+				{
+					::rtl::OUString aClassName = xIdlClass->getName();
+					Type aType( xIdlClass->getTypeClass(), aClassName.getStr() );
+					aRetVal <<= aType;
+				}
+			}
+			else if( eBaseType == SbxSTRING )
+			{
+				// String representing type?
+				String aTypeName = pVar->GetString();
+				Type aType;
+				bool bSuccess = implGetTypeByName( aTypeName, aType );
+				if( bSuccess )
+					aRetVal <<= aType;
+			}
+		}
+		break;
+
 		/* folgende Typen lassen wir erstmal weg
 		case TypeClass_SERVICE:			break;
 		case TypeClass_CLASS:			break;
     (void)pBasic;
     (void)bWrite;
 
+	static String aTypeTypeString( RTL_CONSTASCII_USTRINGPARAM("type") );
+
 	// 2 parameters needed
 	if ( rPar.Count() != 3 )
 	{
 	String aTypeName = rPar.Get(1)->GetString();
     SbxVariable* pVal = rPar.Get(2);
 
+	if( aTypeName == aTypeTypeString )
+	{
+		SbxDataType eBaseType = pVal->SbxValue::GetType();
+		String aValTypeName;
+		if( eBaseType == SbxSTRING )
+		{
+			aValTypeName = pVal->GetString();
+		}
+		else if( eBaseType == SbxOBJECT )
+		{
+			// XIdlClass?
+			Reference< XIdlClass > xIdlClass;
+
+			SbxBaseRef pObj = (SbxBase*)pVal->GetObject();
+			if( pObj && pObj->ISA(SbUnoObject) )
+			{
+				Any aUnoAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
+				aUnoAny >>= xIdlClass;
+			}
+
+			if( xIdlClass.is() )
+				aValTypeName = xIdlClass->getName();
+		}
+		Type aType;
+		bool bSuccess = implGetTypeByName( aValTypeName, aType );
+		if( bSuccess )
+		{
+			Any aTypeAny( aType );
+			SbxVariableRef refVar = rPar.Get(0);
+			SbxObjectRef xUnoAnyObject = new SbUnoAnyObject( aTypeAny );
+			refVar->PutObject( xUnoAnyObject );
+		}
+		return;
+	}
+
     // Check the type
     Reference< XHierarchicalNameAccess > xTypeAccess = getTypeProvider_Impl();
     Any aRet;

basic/source/runtime/dllmgr.cxx

         return e;
     }
     std::vector< char > * blob = data.newBlob();
-    blob->insert(blob->begin(), str.getStr(), str.getStr() + str.getLength());
+    blob->insert(
+        blob->begin(), str.getStr(), str.getStr() + str.getLength() + 1);
     *buffer = address(*blob);
     data.unmarshalStrings.push_back(StringData(variable, *buffer, special));
     return ERRCODE_NONE;

basic/source/runtime/methods.cxx

 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/sound.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <basic/sbx.hxx>
 #include <svl/zforlist.hxx>

berkeleydb/makefile.mk

 db_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 CFLAGS+=-D_GLIBCXX_DLL
-db_LIBS+=-lstdc++_s
+db_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"

binfilter/bf_forms/source/component/forms_Filter.cxx

 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
-#ifndef _SV_WINTYPES_HXX
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_SVAPP_HXX 
 #include <vcl/svapp.hxx>
 #endif

binfilter/bf_sc/source/core/data/sc_attarray.cxx

 /*N*/     short   nIndex = 0;
 /*N*/     USHORT  nThisRow = 0;
 /*N*/ 
-/*N*/     while ( nThisRow <= MAXROW )
+/*N*/     while ( nThisRow <= MAXROW && nIndex < nCount )
 /*N*/ 	{
 /*N*/         const ScPatternAttr* pOldPattern = pData[nIndex].pPattern;
 /*N*/         const SfxPoolItem* pItem;

binfilter/bf_sc/source/ui/docshell/sc_docsh3.cxx

 /*N*/ 
 /*N*/ 	// zweistellige Jahreszahleneingabe aus Extras->Optionen->Allgemein->Sonstiges
 /*N*/ 	aDocOpt.SetYear2000( SFX_APP()->GetMiscConfig()->GetYear2000() );
+        aDocOpt.SetStdPrecision( 2 );   // #i114730# use sdc-compatible value of 2 if not overridden in file
 /*N*/ 
 /*N*/ 	aDocument.SetDocOptions( aDocOpt );
 /*N*/ 	aDocument.SetViewOptions( aViewOpt );

binfilter/bf_sc/source/ui/inc/ui_pch.hxx

 #include <vcl/outdev.hxx>
 #include <vcl/pointr.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/event.hxx>
 #include <limits.h>
 #include <tools/errinf.hxx>
 #include <scresid.hxx>
 #include <docsh.hxx>
 #include <bf_sfx2/interno.hxx>
-#include <vcl/wintypes.hxx>
 #include <bf_sfx2/docfac.hxx>
 #include <scitems.hxx>
 #include <vcl/virdev.hxx>

binfilter/bf_sch/source/ui/inc/globopt.hxx

 #ifndef _SCH_GLOBOPT_HXX
 #define _SCH_GLOBOPT_HXX
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 namespace binfilter {
 
 namespace sch

binfilter/bf_svtools/source/misc/svt_ehdl.cxx

 #ifndef _TOOLS_RCID_H //autogen
 #include <tools/rcid.h>
 #endif
-#ifndef _SV_WINTYPES_HXX //autogen
-#include <vcl/wintypes.hxx>
-#endif
+#include <tools/wintypes.hxx>
 #ifndef _SV_MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif

binfilter/bf_svx/source/unodraw/svx_unoprov.cxx

 #include <com/sun/star/util/MeasureUnit.hpp>
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 #ifndef _SHL_HXX 
 #include <tools/shl.hxx>

binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx

 #include <bf_svx/unomid.hxx>
 #endif
 
-#ifndef _VCL_FLDUNIT_HXX
-#include <vcl/fldunit.hxx>
-#endif
+#include <tools/fldunit.hxx>
 
 #ifndef _SWMODULE_HXX //autogen wg. SW_MOD
 #include <swmodule.hxx>

binfilter/bf_sw/source/ui/inc/modcfg.hxx