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/05/31 15:56:04 UTC
svn commit: r1488227 [15/15] - in /openoffice/branches/rejuvenate01: ./
ext_libraries/apr/ ext_libraries/apr/prj/ ext_libraries/coinmp/prj/
ext_libraries/ratscan/prj/ ext_libraries/serf/prj/ main/
main/basctl/source/dlged/ main/basctl/uiconfig/basicide...
Modified: openoffice/branches/rejuvenate01/main/sw/uiconfig/swreport/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/uiconfig/swreport/toolbar/standardbar.xml?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/uiconfig/swreport/toolbar/standardbar.xml (original)
+++ openoffice/branches/rejuvenate01/main/sw/uiconfig/swreport/toolbar/standardbar.xml Fri May 31 13:55:58 2013
@@ -26,7 +26,7 @@
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
Modified: openoffice/branches/rejuvenate01/main/sw/uiconfig/swriter/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/uiconfig/swriter/menubar/menubar.xml?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/uiconfig/swriter/menubar/menubar.xml (original)
+++ openoffice/branches/rejuvenate01/main/sw/uiconfig/swriter/menubar/menubar.xml Fri May 31 13:55:58 2013
@@ -143,7 +143,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
Modified: openoffice/branches/rejuvenate01/main/sw/uiconfig/swriter/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/uiconfig/swriter/toolbar/standardbar.xml?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/uiconfig/swriter/toolbar/standardbar.xml (original)
+++ openoffice/branches/rejuvenate01/main/sw/uiconfig/swriter/toolbar/standardbar.xml Fri May 31 13:55:58 2013
@@ -26,7 +26,7 @@
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
Modified: openoffice/branches/rejuvenate01/main/sw/uiconfig/swxform/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/uiconfig/swxform/menubar/menubar.xml?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/uiconfig/swxform/menubar/menubar.xml (original)
+++ openoffice/branches/rejuvenate01/main/sw/uiconfig/swxform/menubar/menubar.xml Fri May 31 13:55:58 2013
@@ -141,7 +141,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
Modified: openoffice/branches/rejuvenate01/main/sw/uiconfig/swxform/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/uiconfig/swxform/toolbar/standardbar.xml?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/uiconfig/swxform/toolbar/standardbar.xml (original)
+++ openoffice/branches/rejuvenate01/main/sw/uiconfig/swxform/toolbar/standardbar.xml Fri May 31 13:55:58 2013
@@ -26,7 +26,7 @@
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AddDirect"/>
<toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
Modified: openoffice/branches/rejuvenate01/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sysui/desktop/freedesktop/freedesktop-menus.spec (original)
+++ openoffice/branches/rejuvenate01/main/sysui/desktop/freedesktop/freedesktop-menus.spec Fri May 31 13:55:58 2013
@@ -32,6 +32,11 @@ Conflicts: %pkgprefix-suse-menus
Conflicts: %pkgprefix-debian-menus
Conflicts: %pkgprefix-redhat-menus
Conflicts: %pkgprefix-mandriva-menus
+Obsoletes: openoffice.org3.0-freedesktop-menus
+Obsoletes: openoffice.org3.1-freedesktop-menus
+Obsoletes: openoffice.org3.2-freedesktop-menus
+Obsoletes: openoffice.org3.3-freedesktop-menus
+Obsoletes: openoffice.org3.4-freedesktop-menus
BuildArch: noarch
AutoReqProv: no
%define _binary_filedigest_algorithm 1
Modified: openoffice/branches/rejuvenate01/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ openoffice/branches/rejuvenate01/main/sysui/desktop/mandriva/mandriva-menus.spec Fri May 31 13:55:58 2013
@@ -23,6 +23,11 @@ Version: %version
Release: %release
Summary: %productname desktop integration
Name: %pkgprefix-mandriva-menus
+Obsoletes: openoffice.org3.0-mandriva-menus
+Obsoletes: openoffice.org3.1-mandriva-menus
+Obsoletes: openoffice.org3.2-mandriva-menus
+Obsoletes: openoffice.org3.3-mandriva-menus
+Obsoletes: openoffice.org3.4-mandriva-menus
Group: Office
License: ALv2
AutoReqProv: no
Modified: openoffice/branches/rejuvenate01/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sysui/desktop/redhat/redhat-menus.spec?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ openoffice/branches/rejuvenate01/main/sysui/desktop/redhat/redhat-menus.spec Fri May 31 13:55:58 2013
@@ -28,6 +28,11 @@ License: ALv2
Vendor: Apache Software Foundation
AutoReqProv: no
BuildArch: noarch
+Obsoletes: openoffice.org3.0-redhat-menus
+Obsoletes: openoffice.org3.1-redhat-menus
+Obsoletes: openoffice.org3.2-redhat-menus
+Obsoletes: openoffice.org3.3-redhat-menus
+Obsoletes: openoffice.org3.4-redhat-menus
Requires: redhat-release
Provides: openoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
Modified: openoffice/branches/rejuvenate01/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sysui/desktop/suse/suse-menus.spec?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sysui/desktop/suse/suse-menus.spec (original)
+++ openoffice/branches/rejuvenate01/main/sysui/desktop/suse/suse-menus.spec Fri May 31 13:55:58 2013
@@ -33,6 +33,11 @@ Requires: /etc/SuSE-release
# .. but not for Sun JDS
Conflicts: SunDesktopVersion
Provides: openoffice-desktop-integration
+Obsoletes: openoffice.org3.0-suse-menus
+Obsoletes: openoffice.org3.1-suse-menus
+Obsoletes: openoffice.org3.2-suse-menus
+Obsoletes: openoffice.org3.3-suse-menus
+Obsoletes: openoffice.org3.4-suse-menus
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
Modified: openoffice/branches/rejuvenate01/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/Library_tk.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/toolkit/Library_tk.mk (original)
+++ openoffice/branches/rejuvenate01/main/toolkit/Library_tk.mk Fri May 31 13:55:58 2013
@@ -21,15 +21,15 @@
-$(eval $(call gb_Library_Library,tk))
+$(eval $(call gb_Library_Library,ootk))
-$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
+$(eval $(call gb_Library_set_componentfile,ootk,toolkit/util/ootk))
-$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc))
+$(eval $(call gb_Library_add_package_headers,ootk,toolkit_inc))
-#$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit))
+#$(eval $(call gb_Library_add_precompiled_header,ootk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit))
-$(eval $(call gb_Library_set_include,tk,\
+$(eval $(call gb_Library_set_include,ootk,\
$$(INCLUDE) \
-I$(SRCDIR)/toolkit/inc \
-I$(SRCDIR)/toolkit/inc/pch \
@@ -37,12 +37,12 @@ $(eval $(call gb_Library_set_include,tk,
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,tk,\
+$(eval $(call gb_Library_set_defs,ootk,\
$$(DEFS) \
-DTOOLKIT_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,tk,\
+$(eval $(call gb_Library_add_linked_libs,ootk,\
comphelper \
cppu \
cppuhelper \
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_exception_objects,tk,\
+$(eval $(call gb_Library_add_exception_objects,ootk,\
toolkit/source/awt/asynccallback \
toolkit/source/awt/stylesettings \
toolkit/source/awt/vclxaccessiblecomponent \
@@ -152,12 +152,12 @@ $(eval $(call gb_Library_add_exception_o
))
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,tk,\
+$(eval $(call gb_Library_set_cxxflags,ootk,\
$$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,tk,\
+$(eval $(call gb_Library_add_linked_libs,ootk,\
X11 \
))
endif
Modified: openoffice/branches/rejuvenate01/main/toolkit/inc/toolkit/awt/vclxmenu.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/inc/toolkit/awt/vclxmenu.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/toolkit/inc/toolkit/awt/vclxmenu.hxx (original)
+++ openoffice/branches/rejuvenate01/main/toolkit/inc/toolkit/awt/vclxmenu.hxx Fri May 31 13:55:58 2013
@@ -120,7 +120,7 @@ public:
virtual ::sal_Int16 SAL_CALL getDefaultItem( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL checkItem( ::sal_Int16 nItemId, ::sal_Bool bCheck ) throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isItemChecked( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
- virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Point& Position, ::sal_Int16 Direction ) throw (css::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Rectangle& Position, ::sal_Int16 Direction ) throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isInExecute( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL endExecute( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const css::awt::KeyEvent& aKeyEvent ) throw (css::uno::RuntimeException);
Modified: openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxmenu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxmenu.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxmenu.cxx (original)
+++ openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxmenu.cxx Fri May 31 13:55:58 2013
@@ -578,7 +578,7 @@ throw(css::uno::RuntimeException)
sal_Int16 VCLXMenu::execute(
const css::uno::Reference< css::awt::XWindowPeer >& rxWindowPeer,
- const css::awt::Point& rPos,
+ const css::awt::Rectangle& rPos,
sal_Int16 nFlags )
throw(css::uno::RuntimeException)
{
@@ -588,9 +588,8 @@ throw(css::uno::RuntimeException)
sal_Int16 nRet = 0;
if ( mpMenu && IsPopupMenu() )
{
- const ::Point aPoint = VCLPoint( rPos );
nRet = ((PopupMenu*)mpMenu)->Execute( VCLUnoHelper::GetWindow( rxWindowPeer ),
- ::Rectangle(aPoint,aPoint),
+ VCLRectangle( rPos ),
nFlags | POPUPMENU_NOMOUSEUPCLOSE );
}
return nRet;
Modified: openoffice/branches/rejuvenate01/main/vbahelper/Library_msforms.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vbahelper/Library_msforms.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vbahelper/Library_msforms.mk (original)
+++ openoffice/branches/rejuvenate01/main/vbahelper/Library_msforms.mk Fri May 31 13:55:58 2013
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs
svt \
svx \
stl \
- tk \
+ ootk \
tl \
vbahelper \
vcl \
Modified: openoffice/branches/rejuvenate01/main/vbahelper/Library_vbahelper.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vbahelper/Library_vbahelper.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vbahelper/Library_vbahelper.mk (original)
+++ openoffice/branches/rejuvenate01/main/vbahelper/Library_vbahelper.mk Fri May 31 13:55:58 2013
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
utl \
vcl \
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/vcl/outdev.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/vcl/outdev.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/vcl/outdev.hxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/vcl/outdev.hxx Fri May 31 13:55:58 2013
@@ -562,6 +562,7 @@ public:
SAL_DLLPRIVATE bool ImpTryDrawPolyLineDirect(
const basegfx::B2DPolygon& rB2DPolygon,
double fLineWidth = 0.0,
+ double fTransparency = 0.0,
basegfx::B2DLineJoin eLineJoin = basegfx::B2DLINEJOIN_NONE,
com::sun::star::drawing::LineCap eLineCap = com::sun::star::drawing::LineCap_BUTT);
@@ -699,6 +700,12 @@ public:
double fLineWidth = 0.0,
basegfx::B2DLineJoin = basegfx::B2DLINEJOIN_ROUND,
com::sun::star::drawing::LineCap = com::sun::star::drawing::LineCap_BUTT);
+ bool TryDrawPolyLineDirect(
+ const basegfx::B2DPolygon& rB2DPolygon,
+ double fLineWidth = 0.0,
+ double fTransparency = 0.0,
+ basegfx::B2DLineJoin eLineJoin = basegfx::B2DLINEJOIN_NONE,
+ com::sun::star::drawing::LineCap eLineCap = com::sun::star::drawing::LineCap_BUTT);
/** Render the given polygon as a line stroke
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/win/salbmp.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/win/salbmp.h?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/win/salbmp.h (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/win/salbmp.h Fri May 31 13:55:58 2013
@@ -43,7 +43,7 @@ typedef boost::shared_ptr< Gdiplus::Bitm
class WinSalBitmap : public SalBitmap
{
private:
- friend class GdiPlusBuffer; // allow buffer to remove maGdiPlusBitmap eventually
+ friend class GdiPlusBuffer; // allow buffer to remove maGdiPlusBitmap and mpAssociatedAlpha eventually
Size maSize;
HGLOBAL mhDIB;
@@ -51,8 +51,14 @@ private:
// the buffered evtl. used Gdiplus::Bitmap instance. It is managed by
// GdiPlusBuffer. To make this safe, it is only handed out as shared
- // pointer; the GdiPlusBuffer may delete the local instance
+ // pointer; the GdiPlusBuffer may delete the local instance.
+ //
+ // mpAssociatedAlpha holds the last WinSalBitmap used to construct an
+ // evtl. buffered GdiPlusBmp. This is needed since the GdiPlusBmp is a single
+ // instance and remembered only on the content-WinSalBitmap, not on the
+ // alpha-WinSalBitmap.
GdiPlusBmpPtr maGdiPlusBitmap;
+ const WinSalBitmap* mpAssociatedAlpha;
sal_uInt16 mnBitCount;
Modified: openoffice/branches/rejuvenate01/main/vcl/source/app/svapp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/app/svapp.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/source/app/svapp.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/source/app/svapp.cxx Fri May 31 13:55:58 2013
@@ -1728,7 +1728,7 @@ UnoWrapperBase* Application::GetUnoWrapp
static sal_Bool bAlreadyTriedToCreate = sal_False;
if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate )
{
- ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "tk", sal_True );
+ ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "ootk", sal_True );
oslModule hTkLib = osl_loadModuleRelative(
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hTkLib )
Modified: openoffice/branches/rejuvenate01/main/vcl/source/gdi/outdev.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/gdi/outdev.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/source/gdi/outdev.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/source/gdi/outdev.cxx Fri May 31 13:55:58 2013
@@ -2260,6 +2260,7 @@ void OutputDevice::ImpDrawPolyPolygonWit
bool OutputDevice::ImpTryDrawPolyLineDirect(
const basegfx::B2DPolygon& rB2DPolygon,
double fLineWidth,
+ double fTransparency,
basegfx::B2DLineJoin eLineJoin,
com::sun::star::drawing::LineCap eLineCap)
{
@@ -2289,13 +2290,64 @@ bool OutputDevice::ImpTryDrawPolyLineDir
// draw the polyline
return mpGraphics->DrawPolyLine(
aB2DPolygon,
- 0.0,
+ fTransparency,
aB2DLineWidth,
eLineJoin,
eLineCap,
this);
}
+bool OutputDevice::TryDrawPolyLineDirect(
+ const basegfx::B2DPolygon& rB2DPolygon,
+ double fLineWidth,
+ double fTransparency,
+ basegfx::B2DLineJoin eLineJoin,
+ com::sun::star::drawing::LineCap eLineCap)
+{
+ // AW: Do NOT paint empty PolyPolygons
+ if(!rB2DPolygon.count())
+ return true;
+
+ // we need a graphics
+ if( !mpGraphics )
+ if( !ImplGetGraphics() )
+ return false;
+
+ if( mbInitClipRegion )
+ ImplInitClipRegion();
+
+ if( mbOutputClipped )
+ return true;
+
+ if( mbInitLineColor )
+ ImplInitLineColor();
+
+ const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+ && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
+ && ROP_OVERPAINT == GetRasterOp()
+ && IsLineColor());
+
+ if(bTryAA)
+ {
+ if(ImpTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, fTransparency, eLineJoin, eLineCap))
+ {
+ // worked, add metafile action (if recorded) and return true
+ if( mpMetaFile )
+ {
+ LineInfo aLineInfo;
+ if( fLineWidth != 0.0 )
+ aLineInfo.SetWidth( static_cast<long>(fLineWidth+0.5) );
+ const Polygon aToolsPolygon( rB2DPolygon );
+ mpMetaFile->AddAction( new MetaPolyLineAction( aToolsPolygon, aLineInfo ) );
+ }
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
void OutputDevice::DrawPolyLine(
const basegfx::B2DPolygon& rB2DPolygon,
double fLineWidth,
@@ -2304,8 +2356,6 @@ void OutputDevice::DrawPolyLine(
{
DBG_TRACE( "OutputDevice::DrawPolyLine(B2D&)" );
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
- (void)eLineJoin; // ATM used in UNX, but not in WNT, access it for warning-free
- (void)eLineCap;
#if 0 // MetaB2DPolyLineAction is not implemented yet:
// according to AW adding it is very dangerous since there is a lot
@@ -2347,7 +2397,7 @@ void OutputDevice::DrawPolyLine(
&& IsLineColor());
// use b2dpolygon drawing if possible
- if(bTryAA && ImpTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, eLineJoin, eLineCap))
+ if(bTryAA && ImpTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, 0.0, eLineJoin, eLineCap))
{
return;
}
Modified: openoffice/branches/rejuvenate01/main/vcl/source/gdi/outdev6.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/gdi/outdev6.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/source/gdi/outdev6.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/source/gdi/outdev6.cxx Fri May 31 13:55:58 2013
@@ -302,9 +302,15 @@ void OutputDevice::DrawTransparent( cons
const double fTransparency = 0.01 * nTransparencePercent;
if( mbFillColor )
{
- // draw the transparent polygon
- // NOTE: filled polygons are assumed to be drawn as if they were always closed
- bDrawn = mpGraphics->DrawPolyPolygon( aB2DPolyPolygon, fTransparency, this );
+ // #121591#
+ // CAUTION: Only non printing (pixel-renderer) VCL commands from OutputDevices
+ // should be used when printing. Normally this is avoided by the printer being
+ // non-AAed and thus e.g. on WIN GdiPlus calls are not used. It may be necessary
+ // to add (OUTDEV_PRINTER != meOutDevType) to the entering if statement, thus
+ // using the fallbacl some lines below (which is not very good, though). For
+ // now, WinSalGraphics::drawPolyPolygon will detect printer usage and correct
+ // the wrong mapping (see there for details)
+ bDrawn = mpGraphics->DrawPolyPolygon( aB2DPolyPolygon, fTransparency, this );
}
if( mbLineColor )
Modified: openoffice/branches/rejuvenate01/main/vcl/source/glyphs/gcach_ftyp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/glyphs/gcach_ftyp.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/source/glyphs/gcach_ftyp.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/source/glyphs/gcach_ftyp.cxx Fri May 31 13:55:58 2013
@@ -131,7 +131,7 @@ FT_Error (*pFTEmbolden)(FT_GlyphSlot);
FT_Error (*pFTOblique)(FT_GlyphSlot);
static bool bEnableSizeFT = false;
-typedef ::std::hash_map< const char*, FtFontFile*, CStringHash, CStringEqual> FontFileList;
+typedef ::std::hash_map< const char*, FtFontFile*, rtl::CStringHash, rtl::CStringEqual> FontFileList;
namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; }
// -----------------------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/vcl/source/window/dockwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/window/dockwin.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/source/window/dockwin.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/source/window/dockwin.cxx Fri May 31 13:55:58 2013
@@ -762,10 +762,19 @@ void DockingWindow::Resizing( Size& )
void DockingWindow::StateChanged( StateChangedType nType )
{
- if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+ switch(nType)
{
- ImplInitSettings();
- Invalidate();
+ case STATE_CHANGE_CONTROLBACKGROUND:
+ ImplInitSettings();
+ Invalidate();
+ break;
+
+ case STATE_CHANGE_STYLE:
+ mbDockable = (GetStyle() & WB_DOCKABLE) != 0;
+ break;
+
+ default:
+ break;
}
Window::StateChanged( nType );
Modified: openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salbmp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salbmp.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salbmp.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salbmp.cxx Fri May 31 13:55:58 2013
@@ -161,6 +161,7 @@ public:
if(pSource->maGdiPlusBitmap.get())
{
pSource->maGdiPlusBitmap.reset();
+ pSource->mpAssociatedAlpha = 0;
}
}
}
@@ -186,6 +187,7 @@ WinSalBitmap::WinSalBitmap()
mhDIB(0),
mhDDB(0),
maGdiPlusBitmap(),
+ mpAssociatedAlpha(0),
mnBitCount(0)
{
}
@@ -219,6 +221,16 @@ void WinSalBitmap::Destroy()
GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource) const
{
+ WinSalBitmap* pThat = const_cast< WinSalBitmap* >(this);
+
+ if(maGdiPlusBitmap.get() && pAlphaSource != mpAssociatedAlpha)
+ {
+ // #122350# if associated alpha with which the GDIPlus was constructed has changed
+ // it is necessary to remove it from buffer, reset reference to it and reconstruct
+ pThat->maGdiPlusBitmap.reset();
+ aGdiPlusBuffer.remEntry(const_cast< WinSalBitmap& >(*this));
+ }
+
if(maGdiPlusBitmap.get())
{
aGdiPlusBuffer.touchEntry(const_cast< WinSalBitmap& >(*this));
@@ -227,15 +239,15 @@ GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPl
{
if(maSize.Width() > 0 && maSize.Height() > 0)
{
- WinSalBitmap* pThat = const_cast< WinSalBitmap* >(this);
-
if(pAlphaSource)
{
pThat->maGdiPlusBitmap.reset(pThat->ImplCreateGdiPlusBitmap(*pAlphaSource));
+ pThat->mpAssociatedAlpha = pAlphaSource;
}
else
{
pThat->maGdiPlusBitmap.reset(pThat->ImplCreateGdiPlusBitmap());
+ pThat->mpAssociatedAlpha = 0;
}
if(maGdiPlusBitmap.get())
Modified: openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi_gdiplus.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi_gdiplus.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi_gdiplus.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi_gdiplus.cxx Fri May 31 13:55:58 2013
@@ -178,6 +178,33 @@ bool WinSalGraphics::drawPolyPolygon( co
aGraphics.SetSmoothingMode(Gdiplus::SmoothingModeNone);
}
+ if(mbPrinter)
+ {
+ // #121591#
+ // Normally GdiPlus should not be used for printing at all since printers cannot
+ // print transparent filled polygon geometry and normally this does not happen
+ // since OutputDevice::RemoveTransparenciesFromMetaFile is used as preparation
+ // and no transparent parts should remain for printing. But this can be overriden
+ // by the user and thus happens. This call can only come (currently) from
+ // OutputDevice::DrawTransparent, see comments sthere with the same TaskID.
+ // If it is used, the mapping for the printer is wrong and needs to be corrected. I
+ // checked that there is *no* transformation set (testcode commented out below) and
+ // estimated that a stable factor dependent of the printer's DPI is used. Create
+ // and set a transformation here to correct this
+ const Gdiplus::REAL aDpiX(aGraphics.GetDpiX());
+ const Gdiplus::REAL aDpiY(aGraphics.GetDpiY());
+
+ // test code to check the current transformation at the graphics device
+ //Gdiplus::Matrix matrix;
+ //aGraphics.GetTransform(&matrix);
+ //Gdiplus::REAL elements[6];
+ //matrix.GetElements(elements);
+
+ Gdiplus::Matrix aPrinterTransform;
+ aPrinterTransform.Scale(Gdiplus::REAL(100.0) / aDpiX, Gdiplus::REAL(100.0) / aDpiY);
+ aGraphics.SetTransform(&aPrinterTransform);
+ }
+
aGraphics.FillPath(&aTestBrush, &aPath);
}
Modified: openoffice/branches/rejuvenate01/main/xmloff/source/draw/ximpcustomshape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmloff/source/draw/ximpcustomshape.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/xmloff/source/draw/ximpcustomshape.cxx (original)
+++ openoffice/branches/rejuvenate01/main/xmloff/source/draw/ximpcustomshape.cxx Fri May 31 13:55:58 2013
@@ -410,9 +410,24 @@ sal_Bool GetNextParameter( com::sun::sta
}
}
if ( bValid )
- { // skipping white spaces
- while( ( nIndex < rParaString.getLength() ) && rParaString[ nIndex ] == (sal_Unicode)' ' )
- nIndex++;
+ {
+ // skipping white spaces and commatas (#121507#)
+ const sal_Unicode aSpace(sal_Unicode(' '));
+ const sal_Unicode aCommata(sal_Unicode(','));
+
+ while(nIndex < rParaString.getLength())
+ {
+ const sal_Unicode aCandidate(rParaString[nIndex]);
+
+ if(aSpace == aCandidate || aCommata == aCandidate)
+ {
+ nIndex++;
+ }
+ else
+ {
+ break;
+ }
+ }
}
return bValid;
}
Propchange: openoffice/branches/rejuvenate01/test/
------------------------------------------------------------------------------
Merged /incubator/ooo/branches/gbuild/main/test:r1409408
Merged /incubator/ooo/branches/gbuild/test:r1409408
Merged /openoffice/trunk/test:r1480322-1488188
Propchange: openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1480322-1488188
Merged /incubator/ooo/branches/gbuild/test/testcommon/source/org/openoffice/test/vcl:r1409408
Merged /incubator/ooo/branches/gbuild/main/test/testcommon/source/org/openoffice/test/vcl:r1409408