You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/07/19 17:59:11 UTC
svn commit: r1504925 [6/12] - in /openoffice/branches/rejuvenate01:
ext_libraries/apr-util/ ext_libraries/coinmp/ ext_libraries/serf/
ext_libraries/serf/win/ ext_sources/ main/
main/accessibility/bridge/org/openoffice/java/accessibility/
main/basctl/so...
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/osxdndinstall_lang.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/osxdndinstall_lang.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/osxdndinstall_nologo.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/osxdndinstall_nologo.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo3_installer.icns
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo3_installer.icns?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/mac/sdk/DS_Store_SDK
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/mac/sdk/DS_Store_SDK?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk Fri Jul 19 15:59:04 2013
@@ -38,6 +38,10 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/restartindexingservice.obj
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/javafilter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/javafilter/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/javafilter/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/javafilter/makefile.mk Fri Jul 19 15:59:04 2013
@@ -38,6 +38,10 @@ DYNAMIC_CRT=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/jfregca.obj
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/languagepacks/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/languagepacks/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/languagepacks/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/languagepacks/makefile.mk Fri Jul 19 15:59:04 2013
@@ -46,6 +46,10 @@ CDEFS+=-Dnot_used_define_to_disable_pch
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/lngpckinsthelper.obj \
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/makefile.mk Fri Jul 19 15:59:04 2013
@@ -45,6 +45,10 @@ CDEFS+=-Dnot_used_define_to_disable_pch
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = \
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx Fri Jul 19 15:59:04 2013
@@ -623,7 +623,8 @@ extern "C" UINT __stdcall UninstallPatch
else
return ERROR_SUCCESS;
- std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+// std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+ std::_tstring sProgramDir = sInstDir + TEXT("program\\");
std::_tstring sPatchFile = sProgramDir + TEXT("patchlist.txt");
std::queue< std::_tstring > aSectionNames;
@@ -677,7 +678,8 @@ extern "C" UINT __stdcall UninstallPatch
extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
{
std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
- std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
+// std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
+ std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\");
std::_tstring sPattern = sResourceDir + TEXT("vcl*.res");
WIN32_FIND_DATA aFindFileData;
@@ -857,7 +859,8 @@ extern "C" UINT __stdcall ShowOnlineUpda
// that offers the Online Update is superfluous.
std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
- std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+// std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+ std::_tstring sProgramDir = sInstDir + TEXT("program\\");
std::_tstring sSearchFile = sProgramDir + TEXT("updchk.uno.dll");
WIN32_FIND_DATA data;
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/quickstarter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/quickstarter/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/quickstarter/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/quickstarter/makefile.mk Fri Jul 19 15:59:04 2013
@@ -47,6 +47,10 @@ UWINAPILIB=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
STDSHL += \
$(ADVAPI32LIB)\
$(SHELL32LIB)\
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/rebase/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/rebase/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/rebase/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/rebase/makefile.mk Fri Jul 19 15:59:04 2013
@@ -46,6 +46,10 @@ UWINAPILIB=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
STDSHL += \
$(ADVAPI32LIB)\
$(SHELL32LIB)\
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk Fri Jul 19 15:59:04 2013
@@ -43,6 +43,10 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/reg4allmsi.obj
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/regactivex/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/regactivex/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/regactivex/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/regactivex/makefile.mk Fri Jul 19 15:59:04 2013
@@ -38,6 +38,11 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
+
UWINAPILIB=
SLOFILES = $(SLO)$/regactivex.obj
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/relnotes/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/relnotes/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/relnotes/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/relnotes/makefile.mk Fri Jul 19 15:59:04 2013
@@ -46,6 +46,10 @@ UWINAPILIB=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
SLOFILES = $(SLO)$/relnotes.obj
STDSHL+= \
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/shellextensions/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/shellextensions/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/shellextensions/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/shellextensions/makefile.mk Fri Jul 19 15:59:04 2013
@@ -45,6 +45,10 @@ CDEFS+=-Dnot_used_define_to_disable_pch
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = \
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/tools/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/tools/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/tools/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/win32/customactions/tools/makefile.mk Fri Jul 19 15:59:04 2013
@@ -43,6 +43,10 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/seterror.obj \
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooobanner.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooobanner.bmp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooobitmap.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooobitmap.bmp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooosdkbanner.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooosdkbanner.bmp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooosetup.ico
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/win32/nsis/ooosetup.ico?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/sfx2/Library_sfx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/Library_sfx.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/Library_sfx.mk (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/Library_sfx.mk Fri Jul 19 15:59:04 2013
@@ -213,6 +213,7 @@ $(eval $(call gb_Library_add_exception_o
sfx2/source/menu/virtmenu \
sfx2/source/notify/eventsupplier \
sfx2/source/notify/hintpost \
+ sfx2/source/sidebar/Sidebar \
sfx2/source/sidebar/SidebarChildWindow \
sfx2/source/sidebar/SidebarDockingWindow \
sfx2/source/sidebar/SidebarController \
@@ -236,9 +237,11 @@ $(eval $(call gb_Library_add_exception_o
sfx2/source/sidebar/DrawHelper \
sfx2/source/sidebar/EnumContext \
sfx2/source/sidebar/FocusManager \
+ sfx2/source/sidebar/GridLayouter \
sfx2/source/sidebar/MenuButton \
sfx2/source/sidebar/IContextChangeReceiver \
sfx2/source/sidebar/ILayoutableWindow \
+ sfx2/source/sidebar/Layouter \
sfx2/source/sidebar/Paint \
sfx2/source/sidebar/Panel \
sfx2/source/sidebar/PanelDescriptor \
Modified: openoffice/branches/rejuvenate01/main/sfx2/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/Package_inc.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/Package_inc.mk (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/Package_inc.mk Fri Jul 19 15:59:04 2013
@@ -136,9 +136,12 @@ $(eval $(call gb_Package_add_file,sfx2_i
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ControllerFactory.hxx,sfx2/sidebar/ControllerFactory.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ControllerItem.hxx,sfx2/sidebar/ControllerItem.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/EnumContext.hxx,sfx2/sidebar/EnumContext.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/GridLayouter.hxx,sfx2/sidebar/GridLayouter.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/IContextChangeReceiver.hxx,sfx2/sidebar/IContextChangeReceiver.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ILayoutableWindow.hxx,sfx2/sidebar/ILayoutableWindow.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/Layouter.hxx,sfx2/sidebar/Layouter.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ResourceDefinitions.hrc,sfx2/sidebar/ResourceDefinitions.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/Sidebar.hxx,sfx2/sidebar/Sidebar.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/SidebarChildWindow.hxx,sfx2/sidebar/SidebarChildWindow.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/SidebarPanelBase.hxx,sfx2/sidebar/SidebarPanelBase.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/SidebarToolBox.hxx,sfx2/sidebar/SidebarToolBox.hxx))
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx Fri Jul 19 15:59:04 2013
@@ -103,6 +103,11 @@ public:
*/
::rtl::OUString GetLabel (void) const;
+ /** Return the extended help text for the command.
+ Returns an empty string when the UNO command name is not available.
+ */
+ ::rtl::OUString GetHelpText (void) const;
+
/** Return the icon for the command. Uses the system high contrast mode state.
*/
Image GetIcon (void) const;
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx Fri Jul 19 15:59:04 2013
@@ -99,6 +99,10 @@ private:
DECL_LINK(Activate, ToolBox*);
DECL_LINK(Deactivate, ToolBox*);
+ using ToolBox::Activate;
+ using ToolBox::Deactivate;
+ using DockingWindow::SetPosSizePixel;
+
void CreateController (
const sal_uInt16 nItemId,
const cssu::Reference<css::frame::XFrame>& rxFrame,
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/doc/docfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/doc/docfile.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/doc/docfile.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/doc/docfile.cxx Fri Jul 19 15:59:04 2013
@@ -585,7 +585,9 @@ Reference < XContent > SfxMedium::GetCon
SvStream* SfxMedium::GetInStream()
{
if ( pInStream )
+ {
return pInStream;
+ }
if ( pImp->pTempFile )
{
@@ -601,13 +603,17 @@ SvStream* SfxMedium::GetInStream()
pInStream = NULL;
}
else
+ {
return pInStream;
+ }
}
GetMedium_Impl();
if ( GetError() )
+ {
return NULL;
+ }
return pInStream;
}
@@ -2330,14 +2336,20 @@ void SfxMedium::GetMedium_Impl()
//TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor
if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() )
+ {
SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ }
if ( !GetError() )
{
if ( pImp->xStream.is() )
+ {
pInStream = utl::UcbStreamHelper::CreateStream( pImp->xStream );
+ }
else if ( pImp->xInputStream.is() )
+ {
pInStream = utl::UcbStreamHelper::CreateStream( pImp->xInputStream );
+ }
}
pImp->bDownloadDone = sal_True;
@@ -3447,15 +3459,23 @@ sal_Bool SfxMedium::SetWritableForUserOn
void SfxMedium::CreateTempFile( sal_Bool bReplace )
{
if ( pImp->pTempFile )
- {
+ {
if ( !bReplace )
return;
DELETEZ( pImp->pTempFile );
- aName = String();
- }
+ aName = String();
+ }
- pImp->pTempFile = new ::utl::TempFile();
+ do
+ {
+ pImp->pTempFile = new ::utl::TempFile();
+ if ( GetName().Equals( pImp->pTempFile->GetURL() ) )
+ {
+ delete pImp->pTempFile;
+ pImp->pTempFile = NULL;
+ }
+ } while ( pImp->pTempFile == NULL );
pImp->pTempFile->EnableKillingFile( sal_True );
aName = pImp->pTempFile->GetFileName();
::rtl::OUString aTmpURL = pImp->pTempFile->GetURL();
@@ -3551,9 +3571,20 @@ void SfxMedium::CreateTempFileNoCopy()
{
// this call always replaces the existing temporary file
if ( pImp->pTempFile )
+ {
delete pImp->pTempFile;
+ pImp->pTempFile = NULL;
+ }
- pImp->pTempFile = new ::utl::TempFile();
+ do
+ {
+ pImp->pTempFile = new ::utl::TempFile();
+ if ( GetName().Equals( pImp->pTempFile->GetURL() ) )
+ {
+ delete pImp->pTempFile;
+ pImp->pTempFile = NULL;
+ }
+ } while ( pImp->pTempFile == NULL );
pImp->pTempFile->EnableKillingFile( sal_True );
aName = pImp->pTempFile->GetFileName();
if ( !aName.Len() )
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Accessible.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Accessible.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Accessible.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Accessible.hxx Fri Jul 19 15:59:04 2013
@@ -27,6 +27,7 @@
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
+#include <boost/noncopyable.hpp>
namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.cxx Fri Jul 19 15:59:04 2013
@@ -28,6 +28,15 @@
namespace sfx2 { namespace sidebar {
+AsynchronousCall::AsynchronousCall (void)
+ : maAction(),
+ mnCallId(0)
+{
+}
+
+
+
+
AsynchronousCall::AsynchronousCall (const Action& rAction)
: maAction(rAction),
mnCallId(0)
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.hxx Fri Jul 19 15:59:04 2013
@@ -35,6 +35,7 @@ class AsynchronousCall
public:
typedef ::boost::function<void(void)> Action;
+ AsynchronousCall (void);
AsynchronousCall (const Action& rAction);
~AsynchronousCall (void);
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControllerItem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControllerItem.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControllerItem.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControllerItem.cxx Fri Jul 19 15:59:04 2013
@@ -31,6 +31,7 @@
#include "sfx2/sidebar/CommandInfoProvider.hxx"
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/help.hxx>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
@@ -208,6 +209,23 @@ void ControllerItem::ResetFrame (void)
+::rtl::OUString ControllerItem::GetHelpText (void) const
+{
+ Help* pHelp = Application::GetHelp();
+ if (pHelp != NULL)
+ {
+ if (msCommandName.getLength() > 0)
+ {
+ const ::rtl::OUString sHelp (pHelp->GetHelpText(A2S(".uno:")+msCommandName, NULL));
+ return sHelp;
+ }
+ }
+ return ::rtl::OUString();
+}
+
+
+
+
Image ControllerItem::GetIcon (void) const
{
return GetIcon(Application::GetSettings().GetStyleSettings().GetHighContrastMode());
@@ -228,6 +246,7 @@ Image ControllerItem::GetIcon (const boo
void ControllerItem::SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16 nIndex)
{
rToolBox.SetQuickHelpText(nIndex, GetLabel());
+ rToolBox.SetHelpText(nIndex, GetHelpText());
rToolBox.SetItemImage(nIndex, GetIcon());
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Sidebar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Sidebar.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Sidebar.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Sidebar.cxx Fri Jul 19 15:59:04 2013
@@ -21,7 +21,8 @@
#include "precompiled_sfx2.hxx"
-#include "Sidebar.hxx"
+#include "sfx2/sidebar/Sidebar.hxx"
+#include "SidebarController.hxx"
#include "ResourceManager.hxx"
using namespace css;
@@ -29,53 +30,37 @@ using namespace cssu;
namespace sfx2 { namespace sidebar {
-Sidebar::Sidebar(
- Window& rParentWindow,
- const Reference<frame::XFrame>& rxDocumentFrame)
- : Window(&rParentWindow, WB_DIALOGCONTROL)
-{
- ContentPanelManager::Instance();
-}
-
-
-
-
-Sidebar::~Sidebar (void)
-{
-}
-
-
-
-void Sidebar::Resize (void)
+void Sidebar::ShowPanel (
+ const ::rtl::OUString& rsPanelId,
+ const Reference<frame::XFrame>& rxFrame)
{
- Window::Resize();
- // m_pImpl->OnResize();
-}
-
-
-
-
-void Sidebar::GetFocus (void)
-{
- Window::GetFocus();
- // m_pImpl->OnGetFocus();
+ SidebarController* pController = SidebarController::GetSidebarControllerForFrame(rxFrame);
+ const PanelDescriptor* pPanelDescriptor = ResourceManager::Instance().GetPanelDescriptor(rsPanelId);
+ if (pController!=NULL && pPanelDescriptor != NULL)
+ {
+ // This should be a lot more sophisticated:
+ // - Make the deck switching asynchronous
+ // - Make sure that the panel is visible and expanded after
+ // the switch.
+ // - Make sure to use a context that really shows the panel
+ //
+ // All that is not necessary for the current use cases so lets
+ // keep it simple for the time being.
+ pController->RequestSwitchToDeck(pPanelDescriptor->msDeckId);
+ }
}
-void Sidebar::DataChanged (const DataChangedEvent& rDataChangedEvent)
+void Sidebar::ShowDeck (
+ const ::rtl::OUString& rsDeckId,
+ const Reference<frame::XFrame>& rxFrame)
{
- if (rDataChangedEvent.GetType() == DATACHANGED_SETTINGS
- && (rDataChangedEvent.GetFlags() & SETTINGS_STYLE)!= 0)
- {
- Invalidate();
- }
- else
- Window::DataChanged(rDataChangedEvent);
+ SidebarController* pController = SidebarController::GetSidebarControllerForFrame(rxFrame);
+ if (pController != NULL)
+ pController->RequestSwitchToDeck(rsDeckId);
}
-
-
} } // end of namespace sfx2::sidebar
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.cxx Fri Jul 19 15:59:04 2013
@@ -83,6 +83,8 @@ namespace
namespace sfx2 { namespace sidebar {
+SidebarController::SidebarControllerContainer SidebarController::maSidebarControllerContainer;
+
namespace {
enum MenuId
{
@@ -119,6 +121,7 @@ SidebarController::SidebarController (
msCurrentDeckTitle(),
maPropertyChangeForwarder(::boost::bind(&SidebarController::BroadcastPropertyChange, this)),
maContextChangeUpdate(::boost::bind(&SidebarController::UpdateConfigurations, this)),
+ maAsynchronousDeckSwitch(),
mbIsDeckRequestedOpen(),
mbIsDeckOpen(),
mbCanDeckBeOpened(true),
@@ -161,6 +164,12 @@ SidebarController::SidebarController (
mxReadOnlyModeDispatch->addStatusListener(this, aURL);
SwitchToDeck(A2S("default"));
+
+ WeakReference<SidebarController> xWeakController (this);
+ maSidebarControllerContainer.insert(
+ SidebarControllerContainer::value_type(
+ rxFrame,
+ xWeakController));
}
@@ -173,8 +182,29 @@ SidebarController::~SidebarController (v
+SidebarController* SidebarController::GetSidebarControllerForFrame (
+ const cssu::Reference<css::frame::XFrame>& rxFrame)
+{
+ SidebarControllerContainer::iterator iEntry (maSidebarControllerContainer.find(rxFrame));
+ if (iEntry == maSidebarControllerContainer.end())
+ return NULL;
+
+ cssu::Reference<XInterface> xController (iEntry->second.get());
+ if ( ! xController.is())
+ return NULL;
+
+ return dynamic_cast<SidebarController*>(xController.get());
+}
+
+
+
+
void SAL_CALL SidebarController::disposing (void)
{
+ SidebarControllerContainer::iterator iEntry (maSidebarControllerContainer.find(mxFrame));
+ if (iEntry != maSidebarControllerContainer.end())
+ maSidebarControllerContainer.erase(iEntry);
+
maFocusManager.Clear();
cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
@@ -212,6 +242,7 @@ void SAL_CALL SidebarController::disposi
static_cast<css::beans::XPropertyChangeListener*>(this));
maContextChangeUpdate.CancelRequest();
+ maAsynchronousDeckSwitch.CancelRequest();
}
@@ -227,7 +258,10 @@ void SAL_CALL SidebarController::notifyC
rEvent.ApplicationName,
rEvent.ContextName);
if (maRequestedContext != maCurrentContext)
+ {
+ maAsynchronousDeckSwitch.CancelRequest();
maContextChangeUpdate.RequestCall();
+ }
}
@@ -270,6 +304,7 @@ void SAL_CALL SidebarController::statusC
if ( ! mbIsDocumentReadOnly)
msCurrentDeckId = gsDefaultDeckId;
mnRequestedForceFlags |= SwitchFlag_ForceSwitch;
+ maAsynchronousDeckSwitch.CancelRequest();
maContextChangeUpdate.RequestCall();
}
}
@@ -442,16 +477,6 @@ void SidebarController::UpdateConfigurat
SwitchToDeck(
*ResourceManager::Instance().GetDeckDescriptor(sNewDeckId),
maCurrentContext);
-
-#ifdef DEBUG
- // Show the context name in the deck title bar.
- if (mpCurrentDeck)
- {
- DeckTitleBar* pTitleBar = mpCurrentDeck->GetTitleBar();
- if (pTitleBar != NULL)
- pTitleBar->SetTitle(msCurrentDeckTitle+A2S(" (")+maCurrentContext.msContext+A2S(")"));
- }
-#endif
}
}
@@ -463,6 +488,18 @@ void SidebarController::OpenThenSwitchTo
{
RequestOpenDeck();
SwitchToDeck(rsDeckId);
+ mpTabBar->Invalidate();
+}
+
+
+
+
+void SidebarController::RequestSwitchToDeck (
+ const ::rtl::OUString& rsDeckId)
+{
+ maContextChangeUpdate.CancelRequest();
+ maAsynchronousDeckSwitch.RequestCall(
+ ::boost::bind(&SidebarController::OpenThenSwitchToDeck, this, rsDeckId));
}
@@ -546,10 +583,18 @@ void SidebarController::SwitchToDeck (
mpParentWindow,
::boost::bind(&SidebarController::RequestCloseDeck, this)));
msCurrentDeckTitle = rDeckDescriptor.msTitle;
+
}
if ( ! mpCurrentDeck)
return;
-
+
+#ifdef DEBUG
+ // Show the context name in the deck title bar.
+ DeckTitleBar* pTitleBar = mpCurrentDeck->GetTitleBar();
+ if (pTitleBar != NULL)
+ pTitleBar->SetTitle(rDeckDescriptor.msTitle+A2S(" (")+maCurrentContext.msContext+A2S(")"));
+#endif
+
// Update the panel list.
const sal_Int32 nNewPanelCount (aPanelContextDescriptors.size());
SharedPanelContainer aNewPanels;
@@ -758,6 +803,7 @@ IMPL_LINK(SidebarController, WindowEvent
UpdateTitleBarIcons();
mpParentWindow->Invalidate();
mnRequestedForceFlags |= SwitchFlag_ForceNewDeck | SwitchFlag_ForceNewPanels;
+ maAsynchronousDeckSwitch.CancelRequest();
maContextChangeUpdate.RequestCall();
break;
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarController.hxx Fri Jul 19 15:59:04 2013
@@ -42,6 +42,9 @@
#include <boost/optional.hpp>
#include <cppuhelper/compbase4.hxx>
#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <comphelper/stl_types.hxx>
+
namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
@@ -80,6 +83,15 @@ public:
const cssu::Reference<css::frame::XFrame>& rxFrame);
virtual ~SidebarController (void);
+ /** Return the SidebarController object that is associated with
+ the given XFrame.
+ @return
+ When there is no SidebarController object for the given
+ XFrame then <NULL/> is returned.
+ */
+ static SidebarController* GetSidebarControllerForFrame (
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
+
// ui::XContextChangeEventListener
virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
throw(cssu::RuntimeException);
@@ -113,7 +125,7 @@ public:
const static sal_Int32 SwitchFlag_ForceNewDeck = 0x02;
const static sal_Int32 SwitchFlag_ForceNewPanels = 0x02;
- void SwitchToDeck (
+ void RequestSwitchToDeck (
const ::rtl::OUString& rsDeckId);
void OpenThenSwitchToDeck (
const ::rtl::OUString& rsDeckId);
@@ -129,6 +141,12 @@ public:
FocusManager& GetFocusManager (void);
private:
+ typedef ::std::map<
+ const cssu::Reference<css::frame::XFrame>,
+ cssu::WeakReference<SidebarController>
+ > SidebarControllerContainer;
+ static SidebarControllerContainer maSidebarControllerContainer;
+
::boost::scoped_ptr<Deck> mpCurrentDeck;
SidebarDockingWindow* mpParentWindow;
::boost::scoped_ptr<TabBar> mpTabBar;
@@ -141,6 +159,7 @@ private:
::rtl::OUString msCurrentDeckTitle;
AsynchronousCall maPropertyChangeForwarder;
AsynchronousCall maContextChangeUpdate;
+ AsynchronousCall maAsynchronousDeckSwitch;
/** Two flags control whether the deck is displayed or if only the
tab bar remains visible.
@@ -188,6 +207,8 @@ private:
const bool bIsInitiallyExpanded,
const Context& rContext);
void SwitchToDeck (
+ const ::rtl::OUString& rsDeckId);
+ void SwitchToDeck (
const DeckDescriptor& rDeckDescriptor,
const Context& rContext);
void ShowPopupMenu (
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarDockingWindow.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarDockingWindow.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarDockingWindow.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/SidebarDockingWindow.hxx Fri Jul 19 15:59:04 2013
@@ -24,7 +24,6 @@
#include "sfx2/dockwin.hxx"
#include "sfx2/dockwin.hxx"
-#include "Sidebar.hxx"
#include <rtl/ref.hxx>
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/TabBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/TabBar.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/TabBar.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/TabBar.cxx Fri Jul 19 15:59:04 2013
@@ -236,9 +236,15 @@ void TabBar::Layout (void)
void TabBar::HighlightDeck (const ::rtl::OUString& rsDeckId)
{
- Item* pItem = GetItemForId(rsDeckId);
- if (pItem != NULL)
- pItem->mpButton->Check();
+ for (ItemContainer::iterator iItem(maItems.begin()),iEnd(maItems.end());
+ iItem!=iEnd;
+ ++iItem)
+ {
+ if (iItem->msDeckId.equals(rsDeckId))
+ iItem->mpButton->Check(sal_True);
+ else
+ iItem->mpButton->Check(sal_False);
+ }
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Theme.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Theme.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Theme.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Theme.cxx Fri Jul 19 15:59:04 2013
@@ -424,28 +424,32 @@ void Theme::UpdateTheme (void)
*/
// Gradient style
+ Color aGradientStop2 (aBaseBackgroundColor);
+ aGradientStop2.IncreaseLuminance(17);
+ Color aToolBoxBorderColor (aBaseBackgroundColor);
+ aToolBoxBorderColor.DecreaseLuminance(12);
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBackground],
Any(Tools::VclToAwtGradient(Gradient(
GRADIENT_LINEAR,
- Color(0xf2f2f2),
- Color(0xfefefe)
+ aBaseBackgroundColor.GetRGBColor(),
+ aGradientStop2.GetRGBColor()
))));
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft],
mbIsHighContrastMode
? Any(util::Color(sal_uInt32(0x00ff00)))
- : Any(util::Color(sal_uInt32(0xf2f2f2))));
+ : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners],
mbIsHighContrastMode
? Any(util::Color(sal_uInt32(0x00ff00)))
- : Any(util::Color(sal_uInt32(0xf2f2f2))));
+ : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
setPropertyValue(
maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight],
mbIsHighContrastMode
? Any(util::Color(sal_uInt32(0x00ff00)))
- : Any(util::Color(sal_uInt32(0xf2f2f2))));
+ : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
setPropertyValue(
maPropertyIdToNameMap[Rect_ToolBoxPadding],
Any(awt::Rectangle(2,2,2,2)));
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/view/viewsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/view/viewsh.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/view/viewsh.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/view/viewsh.cxx Fri Jul 19 15:59:04 2013
@@ -988,6 +988,10 @@ void SfxViewShell::UIDeactivated( SfxInP
// uno::Reference < frame::XFramesSupplier > xParentFrame( xOwnFrame->getCreator(), uno::UNO_QUERY );
// if ( xParentFrame.is() )
// xParentFrame->setActiveFrame( uno::Reference < frame::XFrame >() );
+
+ // Make sure that slot servers are initialized or updated after
+ // an OLE object is deactivated.
+ pFrame->GetBindings().InvalidateAll(sal_True);
}
//--------------------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/slideshow/source/engine/slideshowimpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/slideshow/source/engine/slideshowimpl.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/slideshow/source/engine/slideshowimpl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/slideshow/source/engine/slideshowimpl.cxx Fri Jul 19 15:59:04 2013
@@ -2051,6 +2051,18 @@ sal_Bool SlideShowImpl::update( double &
// process queues
maEventQueue.process();
+
+ // #118671# the call above may execute a macro bound to an object. In
+ // that case this macro may have destroyed this local sliseshow so that it
+ // is disposed (see bugdoc at task). In that case, detect this and exit
+ // gently from this slideshow. Do not forget to disable the scoped
+ // call to mpPresTimer, this will be deleted if we are disposed.
+ if (isDisposed())
+ {
+ scopeGuard.dismiss();
+ return false;
+ }
+
maActivitiesQueue.process();
// commit frame to screen
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/control.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/control.pm?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/control.pm (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/control.pm Fri Jul 19 15:59:04 2013
@@ -347,6 +347,9 @@ sub check_logfile
$compareline =~ s/Error\.ulf//g; # removing all occurences of "Error.ulf"
$compareline =~ s/Error\.idl//g; # removing all occurences of "Error.idl"
$compareline =~ s/Error\.html//g; # removing all occurences of "Error.html"
+ # Ugly workaround for (boost) headers
+ $compareline =~ s/error\.hpp//g; # removing all occurences of "error.hpp"
+ $compareline =~ s/error\.ipp//g; # removing all occurences of "error.ipp"
if ( $compareline =~ /\bError\b/i )
{
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/epmfile.pm?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/epmfile.pm Fri Jul 19 15:59:04 2013
@@ -538,23 +538,13 @@ sub create_epm_header
if ( $installer::globals::debian ) { $onereplaces =~ s/_/-/g; } # Debian allows no underline in package name
$line = "%replaces" . " " . $onereplaces . "\n";
push(@epmheader, $line);
-
- # Force the openofficeorg packages to get removed,
- # see http://www.debian.org/doc/debian-policy/ch-relationships.html
- # 7.5.2 Replacing whole packages, forcing their removal
-
- if ( $installer::globals::debian )
- {
- $line = "%incompat" . " " . $onereplaces . "\n";
- push(@epmheader, $line);
- }
}
if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice' )
{
$line = "%provides" . " openoffice.org-unbundled\n";
push(@epmheader, $line);
- $line = "%incompat" . " openoffice.org-bundled\n";
+ $line = "%replaces" . " openoffice.org-bundled\n";
push(@epmheader, $line);
}
}
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/srcrelease.xml Fri Jul 19 15:59:04 2013
@@ -25,7 +25,8 @@
<property name="getrevision.script" value="${env.SOLARENV}/bin/getrevision.pl"/>
<property name="out.dir" value="."/>
- <property name="aoo.name" value="aoo"/>
+ <property name="aoo.name" value="apache-openoffice"/>
+ <property name="aoo.short.name" value="aoo"/>
<property name="aoo.ver" value="4.0.0"/>
<property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" />
@@ -41,8 +42,9 @@
</target>
<target name="declarenames" depends="getrevision">
- <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
- <property name="release.file.name" value="${release.dir.name}-r${scm.revision}-src"/>
+ <property name="release.dir.name" value="${aoo.short.name}-${aoo.ver}"/>
+ <property name="release.name" value="${aoo.name}-${aoo.ver}"/>
+ <property name="release.file.name" value="${release.name}-r${scm.revision}-src"/>
<property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
<property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
<property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>
Modified: openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk Fri Jul 19 15:59:04 2013
@@ -176,7 +176,6 @@ else
gb_GLOBALDEFS += \
-DDBG_UTIL \
-D_STLP_DEBUG \
- -D_DEBUG \
endif
Modified: openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/windows.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/windows.mk Fri Jul 19 15:59:04 2013
@@ -115,7 +115,7 @@ gb_CFLAGS := \
-wd4800 \
-wd4820 \
-wd4826 \
- -Zc:forScope,wchar_t- \
+ -Zc:wchar_t- \
-Zm500 \
gb_CXXFLAGS := \
@@ -161,7 +161,7 @@ gb_CXXFLAGS := \
-wd4800 \
-wd4820 \
-wd4826 \
- -Zc:forScope,wchar_t- \
+ -Zc:wchar_t- \
-Zm500 \
gb_STDLIBS := \
@@ -484,7 +484,7 @@ ifeq ($(USE_SYSTEM_STL),YES)
ifeq ($(gb_PRODUCT),$(true))
gb_Library_STLEXT := msvcprt.lib
else
-gb_Library_STLEXT := msvcprtd.lib
+gb_Library_STLEXT := msvcprt.lib
endif
else
ifeq ($(gb_PRODUCT),$(true))
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/minor.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/minor.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/minor.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/minor.mk Fri Jul 19 15:59:04 2013
@@ -19,7 +19,7 @@
#
# *************************************************************
RSCVERSION=400
-RSCREVISION=400m2(Build:9701)
-BUILD=9701
-LAST_MINOR=m2
+RSCREVISION=400m3(Build:9702)
+BUILD=9702
+LAST_MINOR=m3
SOURCEVERSION=AOO400
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/set_wntx64.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/set_wntx64.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/set_wntx64.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/set_wntx64.mk Fri Jul 19 15:59:04 2013
@@ -37,7 +37,7 @@ LINK_X64*:=$(WRAPCMD) $(LINK_X64_BINARY)
LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO)
IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY)
-USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
+USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:wchar_t- -GR
# Stack buffer overrun detection.
CFLAGS+=-GS
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/wntmsci11.mk Fri Jul 19 15:59:04 2013
@@ -77,7 +77,7 @@ COMPILE_ECHO_FILE=
# disable "warning C4675: resolved overload was found by argument-dependent
# lookup":
# -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800
-CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR
+CFLAGS+=-Zm500 -Zc:wchar_t- -GR
# Stack buffer overrun detection.
CFLAGS+=-GS
@@ -285,14 +285,13 @@ LINKFLAGSOPT=
UWINAPILIB*=uwinapi.lib
.IF "$(DYNAMIC_CRT)"!=""
.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrtd.lib
+LIBCMT=msvcrt.lib
.ELSE # "$(USE_STLP_DEBUG)" != ""
LIBCMT=msvcrt.lib
.ENDIF # "$(USE_STLP_DEBUG)" != ""
.ELSE # "$(DYNAMIC_CRT)"!=""
.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmtd.lib
-CDEFS+=-D_DEBUG
+LIBCMT=libcmt.lib
.ELSE # "$(USE_STLP_DEBUG)" != ""
LIBCMT=libcmt.lib
.ENDIF # "$(USE_STLP_DEBUG)" != ""
@@ -312,13 +311,13 @@ STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kern
.IF "$(USE_SYSTEM_STL)" == "YES"
.IF "$(DYNAMIC_CRT)"!=""
.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT+= msvcprtd.lib
+LIBCMT+= msvcprt.lib
.ELSE
LIBCMT+= msvcprt.lib
.ENDIF
.ELSE # "$(DYNAMIC_CRT)"==""
.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT+= libcpmtd.lib
+LIBCMT+= libcpmt.lib
.ELSE
LIBCMT+= libcpmt.lib
.ENDIF "$(USE_STLP_DEBUG)" == ""
Modified: openoffice/branches/rejuvenate01/main/soltools/mkdepend/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/soltools/mkdepend/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/soltools/mkdepend/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/soltools/mkdepend/makefile.mk Fri Jul 19 15:59:04 2013
@@ -59,12 +59,7 @@ APP1OBJS=$(OBJFILES)
APP1RPATH=NONE
.IF "$(COM)"=="MSC"
-.IF "$(dbgutil)"==""
APP1STDLIBS+=msvcprt.lib
-.ELSE
-APP1STDLIBS+=msvcprtd.lib
-CDEFS+=-D_DEBUG
-.ENDIF # "$(DBG_UTIL)"==""
.ENDIF # "$(COM)"=="MSC"
.IF "$(OS)"=="SOLARIS"
Modified: openoffice/branches/rejuvenate01/main/stlport/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/stlport/prj/build.lst?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/stlport/prj/build.lst (original)
+++ openoffice/branches/rejuvenate01/main/stlport/prj/build.lst Fri Jul 19 15:59:04 2013
@@ -1,2 +1,2 @@
-sl stlport : SO:so_prereq solenv NULL
+sl stlport : SO:so_prereq solenv BOOST:boost NULL
sl stlport nmake - all sl_mkout NULL
Modified: openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx (original)
+++ openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx Fri Jul 19 15:59:04 2013
@@ -146,6 +146,15 @@ namespace svgio
FillRule_evenodd
};
+ enum BaselineShift
+ {
+ BaselineShift_Baseline,
+ BaselineShift_Sub,
+ BaselineShift_Super,
+ BaselineShift_Percentage,
+ BaselineShift_Length
+ };
+
class SvgStyleAttributes
{
private:
@@ -199,6 +208,10 @@ namespace svgio
// ClipRule setting (only valid wne mbIsClipPathContent == true, default is FillRule_nonzero)
FillRule maClipRule;
+ // BaselineShift: Type and number (in case of BaselineShift_Percentage or BaselineShift_Length)
+ BaselineShift maBaselineShift;
+ SvgNumber maBaselineShiftNumber;
+
/// bitfield
// defines if this attributes are part of a ClipPath. If yes,
@@ -425,6 +438,11 @@ namespace svgio
const SvgMarkerNode* accessMarkerEndXLink() const;
void setMarkerEndXLink(const rtl::OUString& rNew) { maMarkerEndXLink = rNew; }
+ // BaselineShift
+ void setBaselineShift(const BaselineShift aBaselineShift = BaselineShift_Baseline) { maBaselineShift = aBaselineShift; }
+ BaselineShift getBaselineShift() const { return maBaselineShift; }
+ void setBaselineShiftNumber(const SvgNumber& rBaselineShift = SvgNumber()) { maBaselineShiftNumber = rBaselineShift; }
+ SvgNumber getBaselineShiftNumber() const;
};
} // end of namespace svgreader
} // end of namespace svgio
Modified: openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgtoken.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgtoken.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgtoken.hxx (original)
+++ openoffice/branches/rejuvenate01/main/svgio/inc/svgio/svgreader/svgtoken.hxx Fri Jul 19 15:59:04 2013
@@ -181,6 +181,7 @@ namespace svgio
// text tokens
SVGTokenText,
+ SVGTokenBaselineShift,
SVGTokenLast
};
Modified: openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgcharacternode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgcharacternode.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgcharacternode.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgcharacternode.cxx Fri Jul 19 15:59:04 2013
@@ -408,6 +408,38 @@ namespace svgio
}
}
+ // get BaselineShift
+ const BaselineShift aBaselineShift(rSvgStyleAttributes.getBaselineShift());
+
+ // apply BaselineShift
+ switch(aBaselineShift)
+ {
+ case BaselineShift_Sub:
+ {
+ aPosition.setY(aPosition.getY() + aTextLayouterDevice.getUnderlineOffset());
+ break;
+ }
+ case BaselineShift_Super:
+ {
+ aPosition.setY(aPosition.getY() + aTextLayouterDevice.getOverlineOffset());
+ break;
+ }
+ case BaselineShift_Percentage:
+ case BaselineShift_Length:
+ {
+ const SvgNumber aNumber(rSvgStyleAttributes.getBaselineShiftNumber());
+ const double mfBaselineShift(aNumber.solve(*this, length));
+
+ aPosition.setY(aPosition.getY() + mfBaselineShift);
+ break;
+ }
+ default: // BaselineShift_Baseline
+ {
+ // nothing to do
+ break;
+ }
+ }
+
// get fill color
const basegfx::BColor aFill(rSvgStyleAttributes.getFill()
? *rSvgStyleAttributes.getFill()
Modified: openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgdocumenthandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgdocumenthandler.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgdocumenthandler.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgdocumenthandler.cxx Fri Jul 19 15:59:04 2013
@@ -86,9 +86,29 @@ namespace
{
if(pLast)
{
+ bool bAddGap(true);
+ static bool bNoGapsForBaselineShift(true);
+
+ if(bNoGapsForBaselineShift)
+ {
+ // With this option a baseline shift between two char parts ('words')
+ // will not add a space 'gap' to the end of the (non-last) word. This
+ // seems to be the standard behaviour, see last bugdoc attached #122524#
+ const svgio::svgreader::SvgStyleAttributes* pStyleLast = pLast->getSvgStyleAttributes();
+ const svgio::svgreader::SvgStyleAttributes* pStyleCurrent = pCandidate->getSvgStyleAttributes();
+
+ if(pStyleLast && pStyleCurrent && pStyleLast->getBaselineShift() != pStyleCurrent->getBaselineShift())
+ {
+ bAddGap = false;
+ }
+ }
+
// add in-between whitespace (single space) to last
// known character node
- pLast->addGap();
+ if(bAddGap)
+ {
+ pLast->addGap();
+ }
}
// remember new last corected character node
Modified: openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgnode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgnode.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgnode.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgnode.cxx Fri Jul 19 15:59:04 2013
@@ -185,12 +185,43 @@ namespace svgio
void SvgNode::parseAttributes(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs)
{
const sal_uInt32 nAttributes(xAttribs->getLength());
-
+ // #122522# SVG defines that 'In general, this means that the presentation attributes have
+ // lower priority than other CSS style rules specified in author style sheets or style
+ // attributes.' in http://www.w3.org/TR/SVG/styling.html#UsingPresentationAttributes
+ // (6.4 Specifying properties using the presentation attributes SVG 1.1). That means that
+ // e.g. font-size will appear as presentation attribute and CSS style attribute. In these
+ // cases, CSS style attributes need to have precedence. To do so it is possible to create
+ // a proirity system for all properties of a shape, but it will also work to parse the
+ // presentation attributes of type 'style' last, so they will overwrite the less-prioritized
+ // already interpreted ones. Thus, remember SVGTokenStyle entries and parse them last.
+ // To make this work it is required that parseAttribute is only called by parseAttributes
+ // which is the case.
+ std::vector< sal_uInt32 > aSVGTokenStyleIndexes;
+
for(sal_uInt32 a(0); a < nAttributes; a++)
{
const ::rtl::OUString aTokenName(xAttribs->getNameByIndex(a));
-
- parseAttribute(aTokenName, StrToSVGToken(aTokenName), xAttribs->getValueByIndex(a));
+ const SVGToken aSVGToken(StrToSVGToken(aTokenName));
+
+ if(SVGTokenStyle == aSVGToken)
+ {
+ // #122522# remember SVGTokenStyle entry
+ aSVGTokenStyleIndexes.push_back(a);
+ }
+ else
+ {
+ parseAttribute(aTokenName, aSVGToken, xAttribs->getValueByIndex(a));
+ }
+ }
+
+ // #122522# parse SVGTokenStyle entries last to override already interpreted
+ // 'presentation attributes' of potenially the same type
+ for(sal_uInt32 b(0); b < aSVGTokenStyleIndexes.size(); b++)
+ {
+ const sal_uInt32 nSVGTokenStyleIndex(aSVGTokenStyleIndexes[b]);
+ const ::rtl::OUString aTokenName(xAttribs->getNameByIndex(nSVGTokenStyleIndex));
+
+ parseAttribute(aTokenName, SVGTokenStyle, xAttribs->getValueByIndex(nSVGTokenStyleIndex));
}
}
Modified: openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgstyleattributes.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgstyleattributes.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgstyleattributes.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgstyleattributes.cxx Fri Jul 19 15:59:04 2013
@@ -997,12 +997,9 @@ namespace svgio
const basegfx::B2DPolyPolygon& rPath,
drawinglayer::primitive2d::Primitive2DSequence& rTarget) const
{
- const bool bIsLine(1 == rPath.count()
- && !rPath.areControlPointsUsed()
- && 2 == rPath.getB2DPolygon(0).count());
-
if(!rPath.count())
{
+ // no geometry at all
return;
}
@@ -1010,13 +1007,7 @@ namespace svgio
if(aGeoRange.isEmpty())
{
- return;
- }
-
- if(!bIsLine && // not for lines
- (basegfx::fTools::equalZero(aGeoRange.getWidth())
- || basegfx::fTools::equalZero(aGeoRange.getHeight())))
- {
+ // no geometry range
return;
}
@@ -1024,11 +1015,21 @@ namespace svgio
if(basegfx::fTools::equalZero(fOpacity))
{
+ // not visible
return;
}
+ // check if it's a line
+ const bool bNoWidth(basegfx::fTools::equalZero(aGeoRange.getWidth()));
+ const bool bNoHeight(basegfx::fTools::equalZero(aGeoRange.getHeight()));
+ const bool bIsTwoPointLine(1 == rPath.count()
+ && !rPath.areControlPointsUsed()
+ && 2 == rPath.getB2DPolygon(0).count());
+ const bool bIsLine(bIsTwoPointLine || bNoWidth || bNoHeight);
+
if(!bIsLine)
{
+ // create fill
basegfx::B2DPolyPolygon aPath(rPath);
const bool bNeedToCheckClipRule(SVGTokenPath == mrOwner.getType() || SVGTokenPolygon == mrOwner.getType());
const bool bClipPathIsNonzero(!bIsLine && bNeedToCheckClipRule && mbIsClipPathContent && FillRule_nonzero == maClipRule);
@@ -1043,6 +1044,7 @@ namespace svgio
add_fill(aPath, rTarget, aGeoRange);
}
+ // create stroke
add_stroke(rPath, rTarget, aGeoRange);
// Svg supports markers for path, polygon, polyline and line
@@ -1169,6 +1171,8 @@ namespace svgio
mpMarkerEndXLink(0),
maFillRule(FillRule_notset),
maClipRule(FillRule_nonzero),
+ maBaselineShift(BaselineShift_Baseline),
+ maBaselineShiftNumber(0),
mbIsClipPathContent(SVGTokenClipPathNode == mrOwner.getType()),
mbStrokeDasharraySet(false)
{
@@ -1803,6 +1807,43 @@ namespace svgio
}
break;
}
+ case SVGTokenBaselineShift:
+ {
+ if(aContent.getLength())
+ {
+ static rtl::OUString aStrSub(rtl::OUString::createFromAscii("sub"));
+ static rtl::OUString aStrSuper(rtl::OUString::createFromAscii("super"));
+ SvgNumber aNum;
+
+ if(aContent.match(aStrSub))
+ {
+ setBaselineShift(BaselineShift_Sub);
+ }
+ else if(aContent.match(aStrSuper))
+ {
+ setBaselineShift(BaselineShift_Super);
+ }
+ else if(readSingleNumber(aContent, aNum))
+ {
+ setBaselineShiftNumber(aNum);
+
+ if(Unit_percent == aNum.getUnit())
+ {
+ setBaselineShift(BaselineShift_Percentage);
+ }
+ else
+ {
+ setBaselineShift(BaselineShift_Length);
+ }
+ }
+ else
+ {
+ // no BaselineShift or inherit (which is automatically)
+ setBaselineShift(BaselineShift_Baseline);
+ }
+ }
+ break;
+ }
default:
{
break;
@@ -2184,6 +2225,24 @@ namespace svgio
{
if(maFontSize.isSet())
{
+ // #122524# Handle Unit_percent realtive to parent FontSize (see SVG1.1
+ // spec 10.10 Font selection properties font-size, lastline (klick 'normative
+ // definition of the property')
+ if(Unit_percent == maFontSize.getUnit())
+ {
+ const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
+
+ if(pSvgStyleAttributes)
+ {
+ const SvgNumber aParentNumber = pSvgStyleAttributes->getFontSize();
+
+ return SvgNumber(
+ aParentNumber.getNumber() * maFontSize.getNumber() * 0.01,
+ aParentNumber.getUnit(),
+ true);
+ }
+ }
+
return maFontSize;
}
@@ -2472,6 +2531,26 @@ namespace svgio
return mpMarkerEndXLink;
}
+ SvgNumber SvgStyleAttributes::getBaselineShiftNumber() const
+ {
+ // #122524# Handle Unit_percent realtive to parent BaselineShift
+ if(Unit_percent == maBaselineShiftNumber.getUnit())
+ {
+ const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
+
+ if(pSvgStyleAttributes)
+ {
+ const SvgNumber aParentNumber = pSvgStyleAttributes->getBaselineShiftNumber();
+
+ return SvgNumber(
+ aParentNumber.getNumber() * maBaselineShiftNumber.getNumber() * 0.01,
+ aParentNumber.getUnit(),
+ true);
+ }
+ }
+
+ return maBaselineShiftNumber;
+ }
} // end of namespace svgreader
} // end of namespace svgio
Modified: openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgsvgnode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgsvgnode.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgsvgnode.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgsvgnode.cxx Fri Jul 19 15:59:04 2013
@@ -173,6 +173,64 @@ namespace svgio
{
if(getParent())
{
+ const bool bWidthIsRelative(!getWidth().isSet() || Unit_percent == getWidth().getUnit());
+ const bool bHeightIsRelative(!getWidth().isSet() || Unit_percent == getWidth().getUnit());
+ const SvgSvgNode* pParentSvgSvgNode = 0;
+ double fW(0.0);
+ double fH(0.0);
+
+ // #122594# if width/height is not given, it's 100% (see 5.1.2 The svg element in SVG1.1 spec).
+ // If it is relative, the question is to what. The previous implementatin assumed relative to the
+ // local ViewBox which is implied by (4.2 Basic data types):
+ //
+ // "Note that the non-property <length> definition also allows a percentage unit identifier.
+ // The meaning of a percentage length value depends on the attribute for which the percentage
+ // length value has been specified. Two common cases are: (a) when a percentage length value
+ // represents a percentage of the viewport width or height (refer to the section that discusses
+ // units in general), and (b) when a percentage length value represents a percentage of the
+ // bounding box width or height on a given object (refer to the section that describes object
+ // bounding box units)."
+ //
+ // This is not closer specified for the SVG element itself as non-outmost element, but comparisons
+ // with common browsers shows that it's mostly interpreted relative to the viewBox of the parent.
+ // Adding code to search the parent SVG element and calculating width/height relative to it's
+ // viewBox width/height (and no longer to the local viewBox).
+ if(bWidthIsRelative || bHeightIsRelative)
+ {
+ for(const SvgNode* pParent = getParent(); pParent && !pParentSvgSvgNode; pParent = pParent->getParent())
+ {
+ pParentSvgSvgNode = dynamic_cast< const SvgSvgNode* >(pParent);
+ }
+ }
+
+ if(bWidthIsRelative)
+ {
+ fW = getWidth().isSet() ? getWidth().getNumber() * 0.01 : 1.0;
+
+ if(pParentSvgSvgNode)
+ {
+ fW *= pParentSvgSvgNode->getViewBox()->getWidth();
+ }
+ }
+ else
+ {
+ fW = getWidth().solve(*this, xcoordinate);
+ }
+
+ if(bHeightIsRelative)
+ {
+ fH = getHeight().isSet() ? getHeight().getNumber() * 0.01 : 1.0;
+
+ if(pParentSvgSvgNode)
+ {
+ fH *= pParentSvgSvgNode->getViewBox()->getHeight();
+ }
+ }
+ else
+ {
+ fH = getHeight().solve(*this, ycoordinate);
+ }
+
if(getViewBox())
{
// Svg defines that with no width or no height the viewBox content is empty,
@@ -182,8 +240,6 @@ namespace svgio
// create target range homing x,y, width and height as given
const double fX(getX().isSet() ? getX().solve(*this, xcoordinate) : 0.0);
const double fY(getY().isSet() ? getY().solve(*this, ycoordinate) : 0.0);
- const double fW(getWidth().isSet() ? getWidth().solve(*this, xcoordinate) : getViewBox()->getWidth());
- const double fH(getHeight().isSet() ? getHeight().solve(*this, ycoordinate) : getViewBox()->getHeight());
const basegfx::B2DRange aTarget(fX, fY, fX + fW, fY + fH);
if(aTarget.equal(*getViewBox()))
@@ -244,10 +300,6 @@ namespace svgio
}
else
{
- // check if we have a size
- const double fW(getWidth().isSet() ? getWidth().solve(*this, xcoordinate) : 0.0);
- const double fH(getHeight().isSet() ? getHeight().solve(*this, ycoordinate) : 0.0);
-
// Svg defines that a negative value is an error and that 0.0 disables rendering
if(basegfx::fTools::more(fW, 0.0) && basegfx::fTools::more(fH, 0.0))
{
Modified: openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgtoken.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgtoken.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgtoken.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svgio/source/svgreader/svgtoken.cxx Fri Jul 19 15:59:04 2013
@@ -165,6 +165,7 @@ namespace svgio
static rtl::OUString aSVGStrStrokeWidth(rtl::OUString::createFromAscii("stroke-width"));
static rtl::OUString aSVGStrText(rtl::OUString::createFromAscii("text"));
+ static rtl::OUString aSVGStrBaselineShift(rtl::OUString::createFromAscii("baseline-shift"));
SVGToken StrToSVGToken(const rtl::OUString& rStr)
{
@@ -307,6 +308,7 @@ namespace svgio
aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrStrokeWidth, SVGTokenStrokeWidth));
aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrText, SVGTokenText));
+ aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrBaselineShift, SVGTokenBaselineShift));
}
const SVGTokenMapper::const_iterator aResult(aSVGTokenMapperList.find(rStr));
Modified: openoffice/branches/rejuvenate01/main/svl/inc/svl/undo.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svl/inc/svl/undo.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svl/inc/svl/undo.hxx (original)
+++ openoffice/branches/rejuvenate01/main/svl/inc/svl/undo.hxx Fri Jul 19 15:59:04 2013
@@ -51,18 +51,21 @@ public:
};
//====================================================================
+class SfxLinkUndoAction;
class SVL_DLLPUBLIC SfxUndoAction
{
- sal_Bool bLinked;
+private:
+ SfxLinkUndoAction* mpSfxLinkUndoAction;
+
public:
TYPEINFO();
SfxUndoAction();
virtual ~SfxUndoAction();
- virtual sal_Bool IsLinked();
- virtual void SetLinked( sal_Bool bIsLinked = sal_True );
- virtual void Undo();
+ virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction);
+
+ virtual void Undo();
virtual void UndoWithContext( SfxUndoContext& i_context );
virtual void Redo();
virtual void RedoWithContext( SfxUndoContext& i_context );
@@ -239,6 +242,7 @@ namespace svl
virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0;
virtual UniString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
+ virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
virtual sal_Bool Undo() = 0;
virtual sal_Bool Redo() = 0;
@@ -357,6 +361,7 @@ public:
virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const;
virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const;
virtual UniString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
+ virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
virtual sal_Bool Undo();
virtual sal_Bool Redo();
virtual void Clear();
@@ -448,6 +453,10 @@ class SVL_DLLPUBLIC SfxLinkUndoAction :
*/
{
+private:
+ friend class SfxUndoAction;
+ void LinkedSfxUndoActionDestructed(const SfxUndoAction& rCandidate);
+
public:
TYPEINFO();
SfxLinkUndoAction(::svl::IUndoManager *pManager);
Modified: openoffice/branches/rejuvenate01/main/svl/source/undo/undo.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svl/source/undo/undo.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svl/source/undo/undo.cxx (original)
+++ openoffice/branches/rejuvenate01/main/svl/source/undo/undo.cxx Fri Jul 19 15:59:04 2013
@@ -63,31 +63,29 @@ SfxUndoContext::~SfxUndoContext()
//------------------------------------------------------------------------
-sal_Bool SfxUndoAction::IsLinked()
+void SfxUndoAction::SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction)
{
- return bLinked;
-}
-
-//------------------------------------------------------------------------
-
-void SfxUndoAction::SetLinked( sal_Bool bIsLinked )
-{
- bLinked = bIsLinked;
+ mpSfxLinkUndoAction = pSfxLinkUndoAction;
}
//------------------------------------------------------------------------
SfxUndoAction::~SfxUndoAction()
{
- DBG_DTOR(SfxUndoAction, 0);
- DBG_ASSERT( !IsLinked(), "Gelinkte Action geloescht" );
+ DBG_DTOR(SfxUndoAction, 0);
+
+ if(mpSfxLinkUndoAction)
+ {
+ mpSfxLinkUndoAction->LinkedSfxUndoActionDestructed(*this);
+ mpSfxLinkUndoAction = 0;
+ }
}
SfxUndoAction::SfxUndoAction()
+: mpSfxLinkUndoAction(0)
{
DBG_CTOR(SfxUndoAction, 0);
- SetLinked( sal_False );
}
//------------------------------------------------------------------------
@@ -455,24 +453,18 @@ void SfxUndoManager::SetMaxUndoActionCou
if ( nPos > m_pData->pActUndoArray->nCurUndoAction )
{
SfxUndoAction* pAction = m_pData->pActUndoArray->aUndoActions[nPos-1].pAction;
- if ( !pAction->IsLinked() )
- {
- aGuard.markForDeletion( pAction );
- m_pData->pActUndoArray->aUndoActions.Remove( nPos-1 );
- --nNumToDelete;
- }
+ aGuard.markForDeletion( pAction );
+ m_pData->pActUndoArray->aUndoActions.Remove( nPos-1 );
+ --nNumToDelete;
}
if ( nNumToDelete > 0 && m_pData->pActUndoArray->nCurUndoAction > 0 )
{
SfxUndoAction* pAction = m_pData->pActUndoArray->aUndoActions[0].pAction;
- if ( !pAction->IsLinked() )
- {
- aGuard.markForDeletion( pAction );
- m_pData->pActUndoArray->aUndoActions.Remove(0);
- --m_pData->pActUndoArray->nCurUndoAction;
- --nNumToDelete;
- }
+ aGuard.markForDeletion( pAction );
+ m_pData->pActUndoArray->aUndoActions.Remove(0);
+ --m_pData->pActUndoArray->nCurUndoAction;
+ --nNumToDelete;
}
if ( nPos == m_pData->pActUndoArray->aUndoActions.size() )
@@ -640,9 +632,7 @@ bool SfxUndoManager::ImplAddUndoAction_N
// respect max number
if( m_pData->pActUndoArray == m_pData->pUndoArray )
{
- while( m_pData->pActUndoArray->aUndoActions.size() >=
- m_pData->pActUndoArray->nMaxUndoActions &&
- !m_pData->pActUndoArray->aUndoActions[0].pAction->IsLinked() )
+ while(m_pData->pActUndoArray->aUndoActions.size() >= m_pData->pActUndoArray->nMaxUndoActions)
{
i_guard.markForDeletion( m_pData->pActUndoArray->aUndoActions[0].pAction );
m_pData->pActUndoArray->aUndoActions.Remove(0);
@@ -841,11 +831,30 @@ size_t SfxUndoManager::ImplGetRedoAction
//------------------------------------------------------------------------
+SfxUndoAction* SfxUndoManager::GetRedoAction( size_t nNo, bool const i_currentLevel ) const
+{
+ UndoManagerGuard aGuard( *m_pData );
+
+ const SfxUndoArray* pUndoArray = i_currentLevel ? m_pData->pActUndoArray : m_pData->pUndoArray;
+ if ( (pUndoArray->nCurUndoAction + nNo) > pUndoArray->aUndoActions.size() )
+ {
+ return NULL;
+ }
+ return pUndoArray->aUndoActions[ pUndoArray->nCurUndoAction + nNo ].pAction;
+}
+
+//------------------------------------------------------------------------
+
XubString SfxUndoManager::GetRedoActionComment( size_t nNo, bool const i_currentLevel ) const
{
+ String sComment;
UndoManagerGuard aGuard( *m_pData );
const SfxUndoArray* pUndoArray = i_currentLevel ? m_pData->pActUndoArray : m_pData->pUndoArray;
- return pUndoArray->aUndoActions[ pUndoArray->nCurUndoAction + nNo ].pAction->GetComment();
+ if ( (pUndoArray->nCurUndoAction + nNo) < pUndoArray->aUndoActions.size() )
+ {
+ sComment = pUndoArray->aUndoActions[ pUndoArray->nCurUndoAction + nNo ].pAction->GetComment();
+ }
+ return sComment;
}
//------------------------------------------------------------------------
@@ -1400,7 +1409,7 @@ SfxLinkUndoAction::SfxLinkUndoAction(::s
{
size_t nPos = pManager->GetUndoActionCount()-1;
pAction = pUndoManagerImplementation->m_pData->pActUndoArray->aUndoActions[nPos].pAction;
- pAction->SetLinked();
+ pAction->SetLinkToSfxLinkUndoAction(this);
}
else
pAction = 0;
@@ -1467,9 +1476,18 @@ XubString SfxLinkUndoAction::GetRepeatCo
SfxLinkUndoAction::~SfxLinkUndoAction()
{
if( pAction )
- pAction->SetLinked( sal_False );
+ pAction->SetLinkToSfxLinkUndoAction(0);
}
+//------------------------------------------------------------------------
+
+void SfxLinkUndoAction::LinkedSfxUndoActionDestructed(const SfxUndoAction& rCandidate)
+{
+ OSL_ENSURE(0 != pAction, "OOps, we have no linked SfxUndoAction (!)");
+ OSL_ENSURE(pAction == &rCandidate, "OOps, the destroyed and linked UndoActions differ (!)");
+ (void)rCandidate;
+ pAction = 0;
+}
//------------------------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/svtools/Executable_bmp.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/Executable_bmp.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/Executable_bmp.mk (original)
+++ openoffice/branches/rejuvenate01/main/svtools/Executable_bmp.mk Fri Jul 19 15:59:04 2013
@@ -44,6 +44,15 @@ $(eval $(call gb_Executable_add_linked_l
$(gb_STDLIBS) \
))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+ $(eval $(call gb_Executable_set_cxxflags,bmp,\
+ $$(CXXFLAGS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_Executable_add_exception_objects,bmp,\
svtools/bmpmaker/bmp \
svtools/bmpmaker/bmpcore \
Modified: openoffice/branches/rejuvenate01/main/svtools/Executable_bmpsum.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/Executable_bmpsum.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/Executable_bmpsum.mk (original)
+++ openoffice/branches/rejuvenate01/main/svtools/Executable_bmpsum.mk Fri Jul 19 15:59:04 2013
@@ -41,6 +41,15 @@ $(eval $(call gb_Executable_add_linked_l
$(gb_STDLIBS) \
))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+ $(eval $(call gb_Executable_set_cxxflags,bmpsum,\
+ $$(CXXFLAGS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_Executable_add_exception_objects,bmpsum,\
svtools/bmpmaker/bmpsum \
))
Modified: openoffice/branches/rejuvenate01/main/svtools/Executable_g2g.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/Executable_g2g.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svtools/Executable_g2g.mk (original)
+++ openoffice/branches/rejuvenate01/main/svtools/Executable_g2g.mk Fri Jul 19 15:59:04 2013
@@ -43,6 +43,15 @@ $(eval $(call gb_Executable_add_linked_l
$(gb_STDLIBS) \
))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+ $(eval $(call gb_Executable_set_cxxflags,g2g,\
+ $$(CXXFLAGS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_Executable_add_exception_objects,g2g,\
svtools/bmpmaker/g2g \
))