You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/03 14:24:38 UTC
svn commit: r1441909 [13/45] - in /openoffice/branches/l10n: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/
ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/
extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Modified: openoffice/branches/l10n/main/cppuhelper/source/findsofficepath.c
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cppuhelper/source/findsofficepath.c?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cppuhelper/source/findsofficepath.c (original)
+++ openoffice/branches/l10n/main/cppuhelper/source/findsofficepath.c Sun Feb 3 13:23:59 2013
@@ -86,7 +86,7 @@ static char* getPathFromRegistryKey( HKE
*/
static char* platformSpecific()
{
- const char* SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath";
+ const char* SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
char* path = NULL;
Modified: openoffice/branches/l10n/main/crashrep/source/all/crashrep.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/crashrep/source/all/crashrep.ulf?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/crashrep/source/all/crashrep.ulf (original)
+++ openoffice/branches/l10n/main/crashrep/source/all/crashrep.ulf Sun Feb 3 13:23:59 2013
@@ -28,7 +28,7 @@ en-US = "Welcome to the %PRODUCTNAME% %P
[%WELCOME_BODY1%]
-en-US = "This error report tool gathers information about how %PRODUCTNAME% is working and sends it to Oracle to help improve future versions.\n\n"
+en-US = "This error report tool gathers information about how %PRODUCTNAME% is working and sends it to Apache OpenOffice to help improve future versions.\n\n"
[%WELCOME_BODY2%]
@@ -36,11 +36,11 @@ en-US = "It's easy - just send the repor
[%WELCOME_BODY3%]
-en-US = "Customer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME% %PRODUCTVERSION% when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME% and will not be shared with third parties.\nFor more information on Oracle's privacy policy, visit\n"
+en-US = "Customer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME% %PRODUCTVERSION% when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME% and will not be shared with third parties.\nFor more information on Apache OpenOffice's privacy policy, visit\n"
[%PRIVACY_URL%]
-en-US = "http://www.oracle.com/html/services-privacy-policy.html"
+en-US = "http://www.openoffice.org/privacy.html"
[%NEXT_BUTTON%]
@@ -64,7 +64,7 @@ en-US = "An error occurred while running
[%REPORT_BODY%]
-en-US = "The %PRODUCTNAME% %PRODUCTVERSION% Error Report has gathered information that could help Oracle improve %PRODUCTNAME%.\nIn the spaces below, you can enter a title for your crash report and describe the action you were trying to carry out when the error occurred. Then click 'Send'.\n"
+en-US = "The %PRODUCTNAME% %PRODUCTVERSION% Error Report has gathered information that could help Apache OpenOffice improve %PRODUCTNAME%.\nIn the spaces below, you can enter a title for your crash report and describe the action you were trying to carry out when the error occurred. Then click 'Send'.\n"
[%ENTER_TITLE%]
@@ -72,7 +72,7 @@ en-US = "Which type of document (e.g. pr
[%ALLOW_CONTACT%]
-en-US = "~I allow Oracle to contact me regarding this report."
+en-US = "~I allow Apache OpenOffice to contact me regarding this report."
[%ENTER_EMAIL%]
@@ -177,7 +177,7 @@ en-US = "Status: The error report has be
[%ERROR_MSG_NOEMAILADDRESS%]
-en-US = "You have marked the option 'I allow Oracle to contact me regarding this report.'\nPlease enter your e-mail address."
+en-US = "You have marked the option 'I allow Apache OpenOffice to contact me regarding this report.'\nPlease enter your e-mail address."
[%MSG_CMDLINE_USAGE%]
Modified: openoffice/branches/l10n/main/cui/source/dialogs/about.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/dialogs/about.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/dialogs/about.cxx (original)
+++ openoffice/branches/l10n/main/cui/source/dialogs/about.cxx Sun Feb 3 13:23:59 2013
@@ -46,7 +46,7 @@
#include <vcl/tabpage.hxx>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/uno/Any.h>
#include "about.hxx"
@@ -532,13 +532,9 @@ IMPL_LINK ( AboutDialog, OpenLinkHdl_Imp
{
try
{
- uno::Reference< uno::XComponentContext > xContext =
- ::comphelper::getProcessComponentContext();
uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShell(
- xContext->getServiceManager()->createInstanceWithContext(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ),
- xContext ),
- uno::UNO_QUERY_THROW );
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShell.is() )
xSystemShell->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
}
Modified: openoffice/branches/l10n/main/cui/source/options/optimprove.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/options/optimprove.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/options/optimprove.cxx (original)
+++ openoffice/branches/l10n/main/cui/source/options/optimprove.cxx Sun Feb 3 13:23:59 2013
@@ -38,7 +38,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/oooimprovement/XCoreController.hpp>
#include <comphelper/configurationhelper.hxx>
@@ -142,12 +142,9 @@ IMPL_LINK( SvxImprovementDialog, HandleH
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShell.is() )
{
xSystemShell->execute(
Modified: openoffice/branches/l10n/main/cui/source/options/optimprove2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/options/optimprove2.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/options/optimprove2.cxx (original)
+++ openoffice/branches/l10n/main/cui/source/options/optimprove2.cxx Sun Feb 3 13:23:59 2013
@@ -40,7 +40,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/oooimprovement/XCore.hpp>
#include <com/sun/star/oooimprovement/XCoreController.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/util/XStringSubstitution.hpp>
#include <comphelper/configurationhelper.hxx>
@@ -111,12 +111,9 @@ IMPL_LINK( SvxImprovementOptionsPage, Ha
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShell.is() )
{
xSystemShell->execute(
Modified: openoffice/branches/l10n/main/cui/source/options/optinet2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/options/optinet2.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/options/optinet2.cxx (original)
+++ openoffice/branches/l10n/main/cui/source/options/optinet2.cxx Sun Feb 3 13:23:59 2013
@@ -874,14 +874,15 @@ void SvxSearchTabPage::InitControls_Impl
}
// resize all labels
- nLabelTextWidth = nLabelTextWidth * 120 / 100; // additional space looks better
+ const Size aSpace = aSearchNameFT.LogicToPixel( Size( RSC_SP_CTRL_DESC_Y, RSC_SP_CTRL_DESC_Y ), MAP_APPFONT );
+ nLabelTextWidth += aSpace.Width();
const long nLabelWidth = aSearchNameFT.GetSizePixel().Width();
const long nDelta = nLabelWidth - nLabelTextWidth;
pLabel = pLabels;
for ( i = 0; i < nLabelCount; ++i, ++pLabel )
{
Size aNewSize = (*pLabel)->GetSizePixel();
- aNewSize.Width() += nDelta;
+ aNewSize.Width() = nLabelTextWidth;
(*pLabel)->SetSizePixel( aNewSize );
}
Modified: openoffice/branches/l10n/main/cui/source/options/optinet2.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/options/optinet2.src?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/options/optinet2.src (original)
+++ openoffice/branches/l10n/main/cui/source/options/optinet2.src Sun Feb 3 13:23:59 2013
@@ -255,7 +255,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
{
HelpId = HID_OPTIONS_SEARCH ;
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Search" ;
@@ -304,7 +304,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 26 ) ;
Size = MAP_APPFONT ( 125 , 10 ) ;
Check = TRUE ;
- Text [ en-US ] = "And" ;
+ Text [ en-US ] = "~And" ;
};
RadioButton RB_OR
{
@@ -379,31 +379,37 @@ TabPage RID_SVXPAGE_INET_SEARCH
< "Lower" ; > ;
};
};
+
+ #define PB_SEARCH_POS_Y TP_HEIGHT - RSC_CD_PUSHBUTTON_HEIGHT - RSC_SP_TBPG_INNERBORDER_BOTTOM
+ #define PB_SEARCH_POS_X1 TP_WIDTH - ( RSC_CD_PUSHBUTTON_WIDTH * 4 ) - ( RSC_SP_CTRL_GROUP_X * 3 ) - RSC_SP_TBPG_INNERBORDER_RIGHT
+ #define PB_SEARCH_POS_X2 TP_WIDTH - ( RSC_CD_PUSHBUTTON_WIDTH * 3 ) - ( RSC_SP_CTRL_GROUP_X * 2 ) - RSC_SP_TBPG_INNERBORDER_RIGHT
+ #define PB_SEARCH_POS_X3 TP_WIDTH - ( RSC_CD_PUSHBUTTON_WIDTH * 2 ) - ( RSC_SP_CTRL_GROUP_X * 1 ) - RSC_SP_TBPG_INNERBORDER_RIGHT
+ #define PB_SEARCH_POS_X4 TP_WIDTH - RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT
PushButton PB_NEW
{
HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW";
- Pos = MAP_APPFONT ( 39 , GB_SEARCH_TOP + 131 + 6 ) ;
+ Pos = MAP_APPFONT ( PB_SEARCH_POS_X1 , PB_SEARCH_POS_Y ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "N~ew";
};
PushButton PB_ADD
{
HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD";
- Pos = MAP_APPFONT ( 92 , GB_SEARCH_TOP + 131 + 6 ) ;
+ Pos = MAP_APPFONT (PB_SEARCH_POS_X2 , PB_SEARCH_POS_Y ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Add" ;
};
PushButton PB_CHANGE
{
HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE";
- Pos = MAP_APPFONT ( 145 , GB_SEARCH_TOP + 131 + 6 ) ;
+ Pos = MAP_APPFONT ( PB_SEARCH_POS_X3 , PB_SEARCH_POS_Y ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Modify" ;
};
PushButton PB_DELETE
{
HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE";
- Pos = MAP_APPFONT ( 198 , GB_SEARCH_TOP + 131 + 6 ) ;
+ Pos = MAP_APPFONT ( PB_SEARCH_POS_X4 , PB_SEARCH_POS_Y ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Delete" ;
};
Modified: openoffice/branches/l10n/main/cui/source/options/optlingu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/options/optlingu.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/options/optlingu.cxx (original)
+++ openoffice/branches/l10n/main/cui/source/options/optlingu.cxx Sun Feb 3 13:23:59 2013
@@ -54,7 +54,7 @@
#include <com/sun/star/linguistic2/XDictionaryList.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <unotools/extendedsecurityoptions.hxx>
#include <svtools/svlbox.hxx>
@@ -148,12 +148,9 @@ static void lcl_OpenURL( const ::rtl::OU
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< css::system::XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
+ css::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShell.is() )
xSystemShell->execute( rURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS );
}
Modified: openoffice/branches/l10n/main/dbaccess/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/dbaccess/util/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/dbaccess/util/makefile.mk (original)
+++ openoffice/branches/l10n/main/dbaccess/util/makefile.mk Sun Feb 3 13:23:59 2013
@@ -126,10 +126,7 @@ SHL2STDLIBS= \
$(VOSLIB) \
$(SALLIB)
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+= $(LB)$/i$(TARGET).lib
-SHL2DEPN=$(LB)$/i$(TARGET).lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2"
SHL2STDLIBS+= \
-l$(TARGET)$(DLLPOSTFIX)
SHL2DEPN=$(SHL1TARGETN)
Modified: openoffice/branches/l10n/main/default_images/svx/res/cropmarkers.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/svx/res/cropmarkers.png?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/default_images/svx/res/cropmarkers2.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/svx/res/cropmarkers2.png?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/default_images/svx/res/cropmarkersACC.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/svx/res/cropmarkersACC.png?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/default_images/svx/res/markers.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/svx/res/markers.png?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/default_images/svx/res/markers2.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/svx/res/markers2.png?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/default_images/svx/res/markersACC.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/svx/res/markersACC.png?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/desktop/registry/data/org/openoffice/Office/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/registry/data/org/openoffice/Office/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/registry/data/org/openoffice/Office/makefile.mk (original)
+++ openoffice/branches/l10n/main/desktop/registry/data/org/openoffice/Office/makefile.mk Sun Feb 3 13:23:59 2013
@@ -38,7 +38,7 @@ PROCESSORDIR=$(SOLARBINDIR)
# --- Files -------------------------------------------------------
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_OOOIMPROVEMENT)"!=""
XCUFILES= \
Jobs.xcu
@@ -53,12 +53,12 @@ SPOOLDIR=$(MISC)$/registry$/spool
MYXCUFILES= \
$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-registration.xcu
-.ELSE # "$(BUILD_SPECIAL)"!=""
+.ELSE # "$(ENABLE_OOOIMPROVEMENT)"!=""
dummy:
@echo "Nothing to build"
-.ENDIF # "$(BUILD_SPECIAL)"!=""
+.ENDIF # "$(ENABLE_OOOIMPROVEMENT)"!=""
# --- Targets ------------------------------------------------------
Modified: openoffice/branches/l10n/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/app/app.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/app/app.cxx (original)
+++ openoffice/branches/l10n/main/desktop/source/app/app.cxx Sun Feb 3 13:23:59 2013
@@ -53,7 +53,6 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/util/XFlushable.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XComponent.hpp>
Modified: openoffice/branches/l10n/main/desktop/source/app/desktop.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/app/desktop.src?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/app/desktop.src (original)
+++ openoffice/branches/l10n/main/desktop/source/app/desktop.src Sun Feb 3 13:23:59 2013
@@ -211,7 +211,7 @@ InfoBox INFOBOX_EXPIRED
{
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
- Message [ en-US ] = "This Evaluation Version has expired. To find out more about %PRODUCTNAME,\nvisit http://www.oracle.com/us/products/applications/open-office.";
+ Message [ en-US ] = "This Evaluation Version has expired. To find out more about %PRODUCTNAME,\nvisit http://www.openoffice.org";
};
String STR_TITLE_EXPIRED
Modified: openoffice/branches/l10n/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx (original)
+++ openoffice/branches/l10n/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx Sun Feb 3 13:23:59 2013
@@ -65,7 +65,7 @@
#include "com/sun/star/i18n/CollatorOptions.hpp"
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/XSystemShellExecute.hpp"
+#include "com/sun/star/system/SystemShellExecute.hpp"
#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
@@ -626,7 +626,7 @@ void DialogHelper::openWebBrowser( const
try
{
uno::Reference< XSystemShellExecute > xSystemShellExecute(
- m_xContext->getServiceManager()->createInstanceWithContext( OUSTR( "com.sun.star.system.SystemShellExecute" ), m_xContext), uno::UNO_QUERY_THROW);
+ com::sun::star::system::SystemShellExecute::create( m_xContext ) );
//throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
xSystemShellExecute->execute( sURL, OUString(), SystemShellExecuteFlags::DEFAULTS );
}
Modified: openoffice/branches/l10n/main/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/deployment/gui/dp_gui_updatedialog.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/deployment/gui/dp_gui_updatedialog.cxx (original)
+++ openoffice/branches/l10n/main/desktop/source/deployment/gui/dp_gui_updatedialog.cxx Sun Feb 3 13:23:59 2013
@@ -61,7 +61,7 @@
#include "com/sun/star/lang/XMultiComponentFactory.hpp"
#include "com/sun/star/lang/XSingleServiceFactory.hpp"
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/XSystemShellExecute.hpp"
+#include "com/sun/star/system/SystemShellExecute.hpp"
#include "com/sun/star/task/XAbortChannel.hpp"
#include "com/sun/star/task/XJob.hpp"
#include "com/sun/star/ucb/CommandAbortedException.hpp"
@@ -1475,10 +1475,7 @@ IMPL_LINK( UpdateDialog, hyperlink_click
try
{
uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
- m_context->getServiceManager()->createInstanceWithContext(
- OUSTR( "com.sun.star.system.SystemShellExecute" ),
- m_context), uno::UNO_QUERY_THROW);
- //throws lang::IllegalArgumentException, system::SystemShellExecuteException
+ com::sun::star::system::SystemShellExecute::create( m_context ) );
xSystemShellExecute->execute(
sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS);
}
Modified: openoffice/branches/l10n/main/desktop/test/deployment/active/Dispatch.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/test/deployment/active/Dispatch.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/test/deployment/active/Dispatch.java (original)
+++ openoffice/branches/l10n/main/desktop/test/deployment/active/Dispatch.java Sun Feb 3 13:23:59 2013
@@ -24,6 +24,7 @@
package com.sun.star.comp.test.deployment.active_java;
import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.MessageBoxType;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.XMessageBox;
import com.sun.star.awt.XMessageBoxFactory;
@@ -74,7 +75,7 @@ public final class Dispatch extends Weak
smgr.createInstanceWithContext(
"com.sun.star.frame.Desktop", context)).
getCurrentFrame().getComponentWindow())),
- new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+ MessageBoxType.INFOBOX, MessageBoxButtons.BUTTONS_OK,
"active", "java");
box.execute();
UnoRuntime.queryInterface(XComponent.class, box).dispose();
Modified: openoffice/branches/l10n/main/desktop/test/deployment/active/active_native.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/test/deployment/active/active_native.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/test/deployment/active/active_native.cxx (original)
+++ openoffice/branches/l10n/main/desktop/test/deployment/active/active_native.cxx Sun Feb 3 13:23:59 2013
@@ -250,8 +250,7 @@ void Dispatch::dispatch(
css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
css::uno::UNO_SET_THROW)->getComponentWindow(),
css::uno::UNO_QUERY_THROW),
- css::awt::Rectangle(),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+ css::awt::MessageBoxType_INFOBOX,
css::awt::MessageBoxButtons::BUTTONS_OK,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("active")),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
Modified: openoffice/branches/l10n/main/desktop/test/deployment/active/active_python.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/test/deployment/active/active_python.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/test/deployment/active/active_python.py (original)
+++ openoffice/branches/l10n/main/desktop/test/deployment/active/active_python.py Sun Feb 3 13:23:59 2013
@@ -24,6 +24,7 @@ import unohelper
from com.sun.star.awt import Rectangle
from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.awt.MessageBoxType import INFOBOX
from com.sun.star.frame import XDispatch, XDispatchProvider
from com.sun.star.lang import XServiceInfo
from com.sun.star.registry import InvalidRegistryException
@@ -79,7 +80,7 @@ class Dispatch(unohelper.Base, XServiceI
smgr.createInstanceWithContext( \
"com.sun.star.frame.Desktop", self.context). \
getCurrentFrame().getComponentWindow(), \
- Rectangle(), "infobox", BUTTONS_OK, "active", "python")
+ INFOBOX, BUTTONS_OK, "active", "python")
box.execute();
box.dispose();
Modified: openoffice/branches/l10n/main/desktop/test/deployment/passive/Dispatch.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/test/deployment/passive/Dispatch.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/test/deployment/passive/Dispatch.java (original)
+++ openoffice/branches/l10n/main/desktop/test/deployment/passive/Dispatch.java Sun Feb 3 13:23:59 2013
@@ -24,6 +24,7 @@
package com.sun.star.comp.test.deployment.passive_java;
import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.MessageBoxType;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.XMessageBox;
import com.sun.star.awt.XMessageBoxFactory;
@@ -74,7 +75,7 @@ public final class Dispatch extends Weak
smgr.createInstanceWithContext(
"com.sun.star.frame.Desktop", context)).
getCurrentFrame().getComponentWindow())),
- new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+ MessageBoxType.INFOBOX, MessageBoxButtons.BUTTONS_OK,
"passive", "java");
box.execute();
UnoRuntime.queryInterface(XComponent.class, box).dispose();
Modified: openoffice/branches/l10n/main/desktop/test/deployment/passive/passive_native.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/test/deployment/passive/passive_native.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/test/deployment/passive/passive_native.cxx (original)
+++ openoffice/branches/l10n/main/desktop/test/deployment/passive/passive_native.cxx Sun Feb 3 13:23:59 2013
@@ -248,8 +248,7 @@ void Dispatch::dispatch(
css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
css::uno::UNO_SET_THROW)->getComponentWindow(),
css::uno::UNO_QUERY_THROW),
- css::awt::Rectangle(),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+ css::awt::MessageBoxType_INFOBOX,
css::awt::MessageBoxButtons::BUTTONS_OK,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passive")),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
Modified: openoffice/branches/l10n/main/desktop/test/deployment/passive/passive_python.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/test/deployment/passive/passive_python.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/test/deployment/passive/passive_python.py (original)
+++ openoffice/branches/l10n/main/desktop/test/deployment/passive/passive_python.py Sun Feb 3 13:23:59 2013
@@ -24,6 +24,7 @@ import unohelper
from com.sun.star.awt import Rectangle
from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.awt.MessageBoxType import INFOBOX
from com.sun.star.frame import XDispatch, XDispatchProvider
from com.sun.star.lang import XServiceInfo
@@ -78,7 +79,7 @@ class Dispatch(unohelper.Base, XServiceI
smgr.createInstanceWithContext( \
"com.sun.star.frame.Desktop", self.context). \
getCurrentFrame().getComponentWindow(), \
- Rectangle(), "infobox", BUTTONS_OK, "passive", "python")
+ INFOBOX, BUTTONS_OK, "passive", "python")
box.execute();
box.dispose();
Modified: openoffice/branches/l10n/main/desktop/util/ooverinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/util/ooverinfo.rc?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/util/ooverinfo.rc (original)
+++ openoffice/branches/l10n/main/desktop/util/ooverinfo.rc Sun Feb 3 13:23:59 2013
@@ -59,7 +59,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -71,7 +71,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
Modified: openoffice/branches/l10n/main/desktop/util/verinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/util/verinfo.rc?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/util/verinfo.rc (original)
+++ openoffice/branches/l10n/main/desktop/util/verinfo.rc Sun Feb 3 13:23:59 2013
@@ -64,7 +64,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName", "Oracle\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -76,7 +76,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "Oracle\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
Modified: openoffice/branches/l10n/main/desktop/win32/source/applauncher/ooo/verinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/win32/source/applauncher/ooo/verinfo.rc?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/win32/source/applauncher/ooo/verinfo.rc (original)
+++ openoffice/branches/l10n/main/desktop/win32/source/applauncher/ooo/verinfo.rc Sun Feb 3 13:23:59 2013
@@ -59,7 +59,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -71,7 +71,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
Modified: openoffice/branches/l10n/main/drawinglayer/Library_drawinglayer.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/Library_drawinglayer.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/Library_drawinglayer.mk (original)
+++ openoffice/branches/l10n/main/drawinglayer/Library_drawinglayer.mk Sun Feb 3 13:23:59 2013
@@ -156,9 +156,7 @@ $(eval $(call gb_Library_add_exception_o
drawinglayer/source/primitive3d/textureprimitive3d \
drawinglayer/source/primitive3d/transformprimitive3d \
drawinglayer/source/processor2d/baseprocessor2d \
- drawinglayer/source/processor2d/vclhelpergradient \
- drawinglayer/source/processor2d/vclhelperbitmaptransform \
- drawinglayer/source/processor2d/vclhelperbitmaprender \
+ drawinglayer/source/processor2d/processor2dtools \
drawinglayer/source/processor2d/vclhelperbufferdevice \
drawinglayer/source/processor2d/vclprocessor2d \
drawinglayer/source/processor2d/helperwrongspellrenderer \
Modified: openoffice/branches/l10n/main/drawinglayer/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/Package_inc.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/Package_inc.mk (original)
+++ openoffice/branches/l10n/main/drawinglayer/Package_inc.mk Sun Feb 3 13:23:59 2013
@@ -102,9 +102,7 @@ $(eval $(call gb_Package_add_file,drawin
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/geometry/viewinformation3d.hxx,drawinglayer/geometry/viewinformation3d.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/baseprocessor2d.hxx,drawinglayer/processor2d/baseprocessor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclprocessor2d.hxx,drawinglayer/processor2d/vclprocessor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx,drawinglayer/processor2d/vclpixelprocessor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx,drawinglayer/processor2d/vclmetafileprocessor2d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/processor2dtools.hxx,drawinglayer/processor2d/processor2dtools.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/contourextractor2d.hxx,drawinglayer/processor2d/contourextractor2d.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/linegeometryextractor2d.hxx,drawinglayer/processor2d/linegeometryextractor2d.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/hittestprocessor2d.hxx,drawinglayer/processor2d/hittestprocessor2d.hxx))
@@ -112,11 +110,10 @@ $(eval $(call gb_Package_add_file,drawin
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/objectinfoextractor2d.hxx,drawinglayer/processor2d/objectinfoextractor2d.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/baseprocessor3d.hxx,drawinglayer/processor3d/baseprocessor3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/cutfindprocessor3d.hxx,drawinglayer/processor3d/cutfindprocessor3d.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/defaultprocessor3d.hxx,drawinglayer/processor3d/defaultprocessor3d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/cutfindprocessor3d.hxx,drawinglayer/processor3d/cutfindprocessor3d.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/geometry2dextractor.hxx,drawinglayer/processor3d/geometry2dextractor.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/shadow3dextractor.hxx,drawinglayer/processor3d/shadow3dextractor.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/zbufferprocessor3d.hxx,drawinglayer/processor3d/zbufferprocessor3d.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillgradientattribute.hxx,drawinglayer/attribute/fillgradientattribute.hxx))
$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillhatchattribute.hxx,drawinglayer/attribute/fillhatchattribute.hxx))
Modified: openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx Sun Feb 3 13:23:59 2013
@@ -105,6 +105,7 @@
#define PRIMITIVE2D_ID_CROPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 66)
#define PRIMITIVE2D_ID_PATTERNFILLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 67)
#define PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 68)
+#define PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 69)
//////////////////////////////////////////////////////////////////////////////
Modified: openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx Sun Feb 3 13:23:59 2013
@@ -33,6 +33,7 @@
#include <drawinglayer/attribute/linestartendattribute.hxx>
#include <drawinglayer/attribute/fillgradientattribute.hxx>
#include <drawinglayer/attribute/fillhatchattribute.hxx>
+#include <drawinglayer/primitive2d/primitivetools2d.hxx>
#include <basegfx/color/bcolor.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -436,6 +437,70 @@ namespace drawinglayer
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
+// PolyPolygonSelectionPrimitive2D class
+
+namespace drawinglayer
+{
+ namespace primitive2d
+ {
+ /** PolyPolygonSelectionPrimitive2D class
+
+ This primitive defines a PolyPolygon which gets filled with a defined color
+ and a defined transparence, but also gets extended ('grown') by the given
+ discrete size (thus being a view-dependent primitive)
+ */
+ class DRAWINGLAYER_DLLPUBLIC PolyPolygonSelectionPrimitive2D : public DiscreteMetricDependentPrimitive2D
+ {
+ private:
+ /// the PolyPolygon geometry
+ basegfx::B2DPolyPolygon maPolyPolygon;
+
+ /// the color
+ basegfx::BColor maColor;
+
+ /// the transparence [0.0 .. 1.0]
+ double mfTransparence;
+
+ /// the discrete grow size ('pixels'), only posivive values allowed
+ double mfDiscreteGrow;
+
+ /// bitfield
+ /// draw polygons filled when fill is set
+ bool mbFill : 1;
+
+ protected:
+ /// local decomposition.
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+
+ public:
+ /// constructor
+ PolyPolygonSelectionPrimitive2D(
+ const basegfx::B2DPolyPolygon& rPolyPolygon,
+ const basegfx::BColor& rColor,
+ double fTransparence,
+ double fDiscreteGrow,
+ bool bFill);
+
+ /// data read access
+ const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const { return maPolyPolygon; }
+ const basegfx::BColor& getColor() const { return maColor; }
+ double getTransparence() const { return mfTransparence; }
+ double getDiscreteGrow() const { return mfDiscreteGrow; }
+ bool getFill() const { return mbFill; }
+
+ /// compare operator
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
+
+ /// get range
+ virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const;
+
+ /// provide unique ID
+ DeclPrimitrive2DIDBlock()
+ };
+ } // end of namespace primitive2d
+} // end of namespace drawinglayer
+
+//////////////////////////////////////////////////////////////////////////////
#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX
Modified: openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx Sun Feb 3 13:23:59 2013
@@ -38,7 +38,7 @@ namespace drawinglayer
/** LineGeometryExtractor2D class
This processor can extract the line geometry from feeded primpitives. The
- hairlines and the fille geometry from fat lines are separated.
+ hairlines and the fill geometry from fat lines are separated.
*/
class DRAWINGLAYER_DLLPUBLIC LineGeometryExtractor2D : public BaseProcessor2D
{
Modified: openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx Sun Feb 3 13:23:59 2013
@@ -72,7 +72,7 @@ namespace drawinglayer
and the extra-data added to it (which can be seen mostly as 'extensions'
or simply as 'hacks').
*/
- class DRAWINGLAYER_DLLPUBLIC VclMetafileProcessor2D : public VclProcessor2D
+ class VclMetafileProcessor2D : public VclProcessor2D
{
private:
/// local helper(s)
Modified: openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx Sun Feb 3 13:23:59 2013
@@ -40,7 +40,7 @@ namespace drawinglayer
all feeded primitives to a VCL Window. It is the currently used renderer
for all VCL editing output from the DrawingLayer.
*/
- class DRAWINGLAYER_DLLPUBLIC VclPixelProcessor2D : public VclProcessor2D
+ class VclPixelProcessor2D : public VclProcessor2D
{
private:
protected:
Modified: openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx Sun Feb 3 13:23:59 2013
@@ -69,7 +69,7 @@ namespace drawinglayer
This processor is the base class for VCL-Based processors. It has no
processBasePrimitive2D implementation and thus is not usable directly.
*/
- class DRAWINGLAYER_DLLPUBLIC VclProcessor2D : public BaseProcessor2D
+ class VclProcessor2D : public BaseProcessor2D
{
protected:
// the destination OutDev
@@ -97,10 +97,8 @@ namespace drawinglayer
void RenderPolygonHairlinePrimitive2D(const primitive2d::PolygonHairlinePrimitive2D& rPolygonCandidate, bool bPixelBased);
void RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate);
void RenderFillGraphicPrimitive2D(const primitive2d::FillGraphicPrimitive2D& rFillBitmapCandidate);
- void RenderPolyPolygonGradientPrimitive2D(const primitive2d::PolyPolygonGradientPrimitive2D& rPolygonCandidate);
void RenderPolyPolygonGraphicPrimitive2D(const primitive2d::PolyPolygonGraphicPrimitive2D& rPolygonCandidate);
void RenderPolyPolygonColorPrimitive2D(const primitive2d::PolyPolygonColorPrimitive2D& rPolygonCandidate);
- void RenderMetafilePrimitive2D(const primitive2d::MetafilePrimitive2D& rPolygonCandidate);
void RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive2D& rMaskCandidate);
void RenderModifiedColorPrimitive2D(const primitive2d::ModifiedColorPrimitive2D& rModifiedCandidate);
void RenderUnifiedTransparencePrimitive2D(const primitive2d::UnifiedTransparencePrimitive2D& rTransCandidate);
Modified: openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx Sun Feb 3 13:23:59 2013
@@ -74,7 +74,7 @@ namespace drawinglayer
rasterconvertB3DPolyPolygon for filled geometry is called. It is a beseclass to
e.g. base a Z-Buffer supported renderer on the 3D primitive processing.
*/
- class DRAWINGLAYER_DLLPUBLIC DefaultProcessor3D : public BaseProcessor3D
+ class DefaultProcessor3D : public BaseProcessor3D
{
protected:
/// read-only scene infos (normal handling, etc...)
Modified: openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx Sun Feb 3 13:23:59 2013
@@ -61,7 +61,7 @@ namespace drawinglayer
raster bitmap using a Z-Buffer based approach. It is able to supersample and to handle
transparent content.
*/
- class DRAWINGLAYER_DLLPUBLIC ZBufferProcessor3D : public DefaultProcessor3D
+ class ZBufferProcessor3D : public DefaultProcessor3D
{
private:
/// the raster target, a Z-Buffer
Modified: openoffice/branches/l10n/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx Sun Feb 3 13:23:59 2013
@@ -64,7 +64,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTopLeft.Crop(
- Rectangle(Point(0,0),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point(0, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maTopLeft;
@@ -77,7 +77,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTop = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTop.Crop(
- Rectangle(Point(nQuarter*2+1,0),Size(1,nQuarter+1)));
+ Rectangle(Point((nQuarter * 2) + 1, 0), Size(1, nQuarter)));
}
return maTop;
@@ -90,7 +90,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTopRight.Crop(
- Rectangle(Point(nQuarter*2+2,0),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point((nQuarter * 2) + 2, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maTopRight;
@@ -103,7 +103,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maRight.Crop(
- Rectangle(Point(nQuarter*3+2,nQuarter*2+1),Size(nQuarter+1,1)));
+ Rectangle(Point((nQuarter * 3) + 3, (nQuarter * 2) + 1), Size(nQuarter, 1)));
}
return maRight;
@@ -116,7 +116,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottomRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottomRight.Crop(
- Rectangle(Point(nQuarter*2+2,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point((nQuarter * 2) + 2, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomRight;
@@ -129,7 +129,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottom = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottom.Crop(
- Rectangle(Point(nQuarter*2+1,nQuarter*3+2),Size(1,nQuarter+1)));
+ Rectangle(Point((nQuarter * 2) + 1, (nQuarter * 3) + 3), Size(1, nQuarter)));
}
return maBottom;
@@ -142,7 +142,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottomLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottomLeft.Crop(
- Rectangle(Point(0,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point(0, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomLeft;
@@ -155,7 +155,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maLeft.Crop(
- Rectangle(Point(0,nQuarter*2+1),Size(nQuarter+1,1)));
+ Rectangle(Point(0, (nQuarter * 2) + 1), Size(nQuarter, 1)));
}
return maLeft;
@@ -192,9 +192,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getTopLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- -fBorderX,
+ -fBorderX,
-fBorderY)));
// Top
@@ -202,9 +202,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getTop(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- 1.0 - (2.0 * fBorderX) - fSingleX,
- fBorderY + fSingleY,
- fBorderX + fSingleX,
+ 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
+ fBorderY,
+ fBorderX + fSingleX,
-fBorderY)));
// TopRight
@@ -212,9 +212,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getTopRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- 1.0 - fBorderX,
+ 1.0 - fBorderX,
-fBorderY)));
// Right
@@ -222,9 +222,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBorderX + fSingleX,
- 1.0 - (2.0 * fBorderY) - fSingleY,
- 1.0,
+ fBorderX,
+ 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
+ 1.0 + fSingleX,
fBorderY + fSingleY)));
// BottomRight
@@ -232,29 +232,29 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getBottomRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- 1.0 - fBorderX,
- 1.0 - fBorderY)));
+ 1.0 - (fBorderX + fSingleX) + fSingleX,
+ 1.0 - (fBorderY + fSingleY) + fSingleY)));
// Bottom
xRetval[5] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getBottom(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- 1.0 - (2.0 * fBorderX) - fSingleX,
- fBorderY + fSingleY,
- fBorderX + fSingleX,
- 1.0)));
+ 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
+ fBorderY,
+ fBorderX + fSingleX,
+ 1.0 + fSingleY)));
// BottomLeft
xRetval[6] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getBottomLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- -fBorderX,
+ -fBorderX,
1.0 - fBorderY)));
// Left
@@ -262,9 +262,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBorderX + fSingleX,
- 1.0 - (2.0 * fBorderY) - fSingleY,
- -fBorderX,
+ fBorderX,
+ 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
+ -fBorderX,
fBorderY + fSingleY)));
// put all in object transformation to get to target positions
Modified: openoffice/branches/l10n/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx Sun Feb 3 13:23:59 2013
@@ -195,7 +195,11 @@ namespace
// create BitmapEx
Bitmap aMainBitmap = aVirtualDevice.GetBitmap(Point(), aVirtualDevice.GetOutputSizePixel());
- Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap(Point(), aVirtualDeviceMask.GetOutputSizePixel());
+#if defined(MACOSX)
+ AlphaMask aMaskBitmap( aVirtualDeviceMask.GetBitmap( Point(), aVirtualDeviceMask.GetOutputSizePixel()));
+#else
+ Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap( Point(), aVirtualDeviceMask.GetOutputSizePixel());
+#endif
aNextStep.maBitmapEx = BitmapEx(aMainBitmap, aMaskBitmap);
// add to vector
Modified: openoffice/branches/l10n/main/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx Sun Feb 3 13:23:59 2013
@@ -35,6 +35,8 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <vcl/graph.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -118,7 +120,12 @@ namespace drawinglayer
for(sal_uInt32 a(0L); a < nCount; a++)
{
- aRetval[a] = Primitive2DReference(new PolygonMarkerPrimitive2D(aPolyPolygon.getB2DPolygon(a), getRGBColorA(), getRGBColorB(), getDiscreteDashLength()));
+ aRetval[a] = Primitive2DReference(
+ new PolygonMarkerPrimitive2D(
+ aPolyPolygon.getB2DPolygon(a),
+ getRGBColorA(),
+ getRGBColorB(),
+ getDiscreteDashLength()));
}
return aRetval;
@@ -580,4 +587,107 @@ namespace drawinglayer
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
+
+namespace drawinglayer
+{
+ namespace primitive2d
+ {
+ Primitive2DSequence PolyPolygonSelectionPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ {
+ Primitive2DSequence aRetval;
+
+ if(getTransparence() < 1.0 && getB2DPolyPolygon().count())
+ {
+ if(getFill() && getB2DPolyPolygon().isClosed())
+ {
+ // create fill primitive
+ const Primitive2DReference aFill(
+ new PolyPolygonColorPrimitive2D(
+ getB2DPolyPolygon(),
+ getColor()));
+
+ aRetval = Primitive2DSequence(&aFill, 1);
+ }
+
+ if(getDiscreteGrow() > 0.0)
+ {
+ const attribute::LineAttribute aLineAttribute(
+ getColor(),
+ getDiscreteGrow() * getDiscreteUnit() * 2.0);
+ const Primitive2DReference aFatLine(
+ new PolyPolygonStrokePrimitive2D(
+ getB2DPolyPolygon(),
+ aLineAttribute));
+
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aFatLine);
+ }
+
+ // embed filled to transparency (if used)
+ if(aRetval.getLength() && getTransparence() > 0.0)
+ {
+ const Primitive2DReference aTrans(
+ new UnifiedTransparencePrimitive2D(
+ aRetval,
+ getTransparence()));
+
+ aRetval = Primitive2DSequence(&aTrans, 1);
+ }
+ }
+
+ return aRetval;
+ }
+
+ PolyPolygonSelectionPrimitive2D::PolyPolygonSelectionPrimitive2D(
+ const basegfx::B2DPolyPolygon& rPolyPolygon,
+ const basegfx::BColor& rColor,
+ double fTransparence,
+ double fDiscreteGrow,
+ bool bFill)
+ : DiscreteMetricDependentPrimitive2D(),
+ maPolyPolygon(rPolyPolygon),
+ maColor(rColor),
+ mfTransparence(fTransparence),
+ mfDiscreteGrow(fabs(fDiscreteGrow)),
+ mbFill(bFill)
+ {
+ }
+
+ bool PolyPolygonSelectionPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
+ {
+ if(DiscreteMetricDependentPrimitive2D::operator==(rPrimitive))
+ {
+ const PolyPolygonSelectionPrimitive2D& rCompare = (PolyPolygonSelectionPrimitive2D&)rPrimitive;
+
+ return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon()
+ && getColor() == rCompare.getColor()
+ && getTransparence() == rCompare.getTransparence()
+ && getDiscreteGrow() == rCompare.getDiscreteGrow()
+ && getFill() == rCompare.getFill());
+ }
+
+ return false;
+ }
+
+ basegfx::B2DRange PolyPolygonSelectionPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
+ {
+ basegfx::B2DRange aRetval(basegfx::tools::getRange(getB2DPolyPolygon()));
+
+ if(getDiscreteGrow() > 0.0)
+ {
+ // get the current DiscreteUnit (not sure if getDiscreteUnit() is updated here, better go safe way)
+ const double fDiscreteUnit((rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0)).getLength());
+
+ aRetval.grow(fDiscreteUnit * getDiscreteGrow());
+ }
+
+ return aRetval;
+ }
+
+ // provide unique ID
+ ImplPrimitrive2DIDBlock(PolyPolygonSelectionPrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D)
+
+ } // end of namespace primitive2d
+} // end of namespace drawinglayer
+
+//////////////////////////////////////////////////////////////////////////////
// eof
Modified: openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx Sun Feb 3 13:23:59 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_drawinglayer.hxx"
@@ -32,6 +30,7 @@
#include <vcl/timer.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <vcl/lazydelete.hxx>
+#include <vcl/dibtools.hxx>
//////////////////////////////////////////////////////////////////////////////
// buffered VDev usage
@@ -299,7 +298,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew((const String&)String(ByteString( "c:\\content.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aContent;
+ WriteDIB(aContent, aNew, false, true);
}
if(mpAlpha)
@@ -310,7 +309,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew((const String&)String(ByteString( "c:\\transparence.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aAlphaMask.GetBitmap();
+ WriteDIB(aAlphaMask.GetBitmap(), aNew, false, true);
}
mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aAlphaMask));
@@ -323,7 +322,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew((const String&)String(ByteString( "c:\\mask.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aMask;
+ WriteDIB(aMask, aNew, false, true);
}
mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aMask));
Modified: openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx Sun Feb 3 13:23:59 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_drawinglayer.hxx"
@@ -34,7 +32,6 @@
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <basegfx/polygon/b2dpolygonclipper.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
@@ -61,6 +58,7 @@
#include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
#include <basegfx/polygon/b2dlinegeometry.hxx>
+#include <vcl/dibtools.hxx>
//////////////////////////////////////////////////////////////////////////////
// for PDFExtOutDevData Graphic support
@@ -1623,9 +1621,6 @@ namespace drawinglayer
impStartSvtGraphicFill(pSvtGraphicFill);
mpOutputDevice->DrawGradient(aToolsPolyPolygon, aVCLGradient);
impEndSvtGraphicFill(pSvtGraphicFill);
-
- // NO usage of common own gradient randerer, not used ATM for VCL MetaFile, see text above
- // RenderPolyPolygonGradientPrimitive2D(static_cast< const primitive2d::PolyPolygonGradientPrimitive2D& >(rCandidate));
}
break;
@@ -1690,23 +1685,6 @@ namespace drawinglayer
break;
}
- case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
- {
- static bool bUseMetaFilePrimitiveDecomposition(true);
-
- if(bUseMetaFilePrimitiveDecomposition)
- {
- // use new Metafile decomposition
- process(rCandidate.get2DDecomposition(getViewInformation2D()));
- }
- else
- {
- // direct draw of MetaFile, use default pocessing
- RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate));
- }
-
- break;
- }
case PRIMITIVE2D_ID_MASKPRIMITIVE2D :
{
// mask group. Special handling for MetaFiles.
@@ -2062,7 +2040,8 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew(String(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aBmContent;
+
+ WriteDIB(aBmContent, aNew, false, true);
}
#endif
Modified: openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx Sun Feb 3 13:23:59 2013
@@ -195,7 +195,29 @@ namespace drawinglayer
case PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D :
{
// direct draw of gradient
- RenderPolyPolygonGradientPrimitive2D(static_cast< const primitive2d::PolyPolygonGradientPrimitive2D& >(rCandidate));
+ const primitive2d::PolyPolygonGradientPrimitive2D& rPolygonCandidate = static_cast< const primitive2d::PolyPolygonGradientPrimitive2D& >(rCandidate);
+ const attribute::FillGradientAttribute& rGradient(rPolygonCandidate.getFillGradient());
+ basegfx::BColor aStartColor(maBColorModifierStack.getModifiedColor(rGradient.getStartColor()));
+ basegfx::BColor aEndColor(maBColorModifierStack.getModifiedColor(rGradient.getEndColor()));
+ basegfx::B2DPolyPolygon aLocalPolyPolygon(rPolygonCandidate.getB2DPolyPolygon());
+
+ if(aLocalPolyPolygon.count())
+ {
+ aLocalPolyPolygon.transform(maCurrentTransformation);
+
+ if(aStartColor == aEndColor)
+ {
+ // no gradient at all, draw as polygon in AA and non-AA case
+ mpOutputDevice->SetLineColor();
+ mpOutputDevice->SetFillColor(Color(aStartColor));
+ mpOutputDevice->DrawPolyPolygon(aLocalPolyPolygon);
+ }
+ else
+ {
+ // use the primitive decomposition of the metafile
+ process(rPolygonCandidate.get2DDecomposition(getViewInformation2D()));
+ }
+ }
break;
}
case PRIMITIVE2D_ID_POLYPOLYGONGRAPHICPRIMITIVE2D :
@@ -221,17 +243,8 @@ namespace drawinglayer
mpOutputDevice->SetAntialiasing(nOldAntiAliase | ANTIALIASING_PIXELSNAPHAIRLINE);
}
- static bool bTestMetaFilePrimitiveDecomposition(true);
- if(bTestMetaFilePrimitiveDecomposition)
- {
- // use new Metafile decomposition
- process(rCandidate.get2DDecomposition(getViewInformation2D()));
- }
- else
- {
- // direct draw of MetaFile
- RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate));
- }
+ // use new Metafile decomposition
+ process(rCandidate.get2DDecomposition(getViewInformation2D()));
if(bForceLineSnap)
{
Modified: openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclprocessor2d.cxx (original)
+++ openoffice/branches/l10n/main/drawinglayer/source/processor2d/vclprocessor2d.cxx Sun Feb 3 13:23:59 2013
@@ -31,13 +31,10 @@
#include <vcl/outdev.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <vclhelperbitmaptransform.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <vclhelperbitmaprender.hxx>
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
#include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-#include <vclhelpergradient.hxx>
#include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
@@ -390,14 +387,28 @@ namespace drawinglayer
// direct draw of transformed BitmapEx primitive
void VclProcessor2D::RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate)
{
- // create local transform
- basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * rBitmapCandidate.getTransform());
- BitmapEx aBitmapEx(rBitmapCandidate.getBitmapEx());
- bool bPainted(false);
+ // check local ViewPort
+ const basegfx::B2DRange& rDiscreteViewPort(getViewInformation2D().getDiscreteViewport());
+ const basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * rBitmapCandidate.getTransform());
+
+ if(!rDiscreteViewPort.isEmpty())
+ {
+ // check if we are visible
+ basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0);
+
+ aUnitRange.transform(aLocalTransform);
+
+ if(!aUnitRange.overlaps(rDiscreteViewPort))
+ {
+ return;
+ }
+ }
+
+ BitmapEx aBitmapEx(rBitmapCandidate.getBitmapEx());
if(maBColorModifierStack.count())
{
- aBitmapEx = impModifyBitmapEx(maBColorModifierStack, aBitmapEx);
+ aBitmapEx = aBitmapEx.ModifyBitmapEx(maBColorModifierStack);
if(aBitmapEx.IsEmpty())
{
@@ -410,43 +421,33 @@ namespace drawinglayer
mpOutputDevice->SetLineColor();
mpOutputDevice->DrawPolygon(aPolygon);
- bPainted = true;
+ return;
}
}
- if(!bPainted)
- {
- static bool bForceUseOfOwnTransformer(false);
- static bool bUseGraphicManager(true);
+ // decompose matrix to check for shear, rotate and mirroring
+ basegfx::B2DVector aScale, aTranslate;
+ double fRotate, fShearX;
- // decompose matrix to check for shear, rotate and mirroring
- basegfx::B2DVector aScale, aTranslate;
- double fRotate, fShearX;
- aLocalTransform.decompose(aScale, aTranslate, fRotate, fShearX);
+ aLocalTransform.decompose(aScale, aTranslate, fRotate, fShearX);
- if(!bForceUseOfOwnTransformer && basegfx::fTools::equalZero(fShearX))
- {
- if(!bUseGraphicManager && basegfx::fTools::equalZero(fRotate))
- {
- RenderBitmapPrimitive2D_BitmapEx(*mpOutputDevice, aBitmapEx, aLocalTransform);
- }
- else
- {
- RenderBitmapPrimitive2D_GraphicManager(*mpOutputDevice, aBitmapEx, aLocalTransform);
- }
- }
- else
- {
- if(!aBitmapEx.IsTransparent() && (!basegfx::fTools::equalZero(fShearX) || !basegfx::fTools::equalZero(fRotate)))
- {
- // parts will be uncovered, extend aBitmapEx with a mask bitmap
- const Bitmap aContent(aBitmapEx.GetBitmap());
- aBitmapEx = BitmapEx(aContent, Bitmap(aContent.GetSizePixel(), 1));
- }
+ const bool bRotated(!basegfx::fTools::equalZero(fRotate));
+ const bool bSheared(!basegfx::fTools::equalZero(fShearX));
- RenderBitmapPrimitive2D_self(*mpOutputDevice, aBitmapEx, aLocalTransform);
- }
+ if(!aBitmapEx.IsTransparent() && (bSheared || bRotated))
+ {
+ // parts will be uncovered, extend aBitmapEx with a mask bitmap
+ const Bitmap aContent(aBitmapEx.GetBitmap());
+#if defined(MACOSX)
+ const AlphaMask aMaskBmp( aContent.GetSizePixel());
+#else
+ const Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+#endif
+ aBitmapEx = BitmapEx(aContent, aMaskBmp);
}
+
+ // draw using OutputDevice'sDrawTransformedBitmapEx
+ mpOutputDevice->DrawTransformedBitmapEx(aLocalTransform, aBitmapEx);
}
void VclProcessor2D::RenderFillGraphicPrimitive2D(const primitive2d::FillGraphicPrimitive2D& rFillBitmapCandidate)
@@ -527,7 +528,7 @@ namespace drawinglayer
if(maBColorModifierStack.count())
{
// when color modifier, apply to bitmap
- aBitmapEx = impModifyBitmapEx(maBColorModifierStack, aBitmapEx);
+ aBitmapEx = aBitmapEx.ModifyBitmapEx(maBColorModifierStack);
// impModifyBitmapEx uses empty bitmap as sign to return that
// the content will be completely replaced to mono color, use shortcut
@@ -664,44 +665,6 @@ namespace drawinglayer
}
}
- // direct draw of gradient
- void VclProcessor2D::RenderPolyPolygonGradientPrimitive2D(const primitive2d::PolyPolygonGradientPrimitive2D& rPolygonCandidate)
- {
- const attribute::FillGradientAttribute& rGradient(rPolygonCandidate.getFillGradient());
- basegfx::BColor aStartColor(maBColorModifierStack.getModifiedColor(rGradient.getStartColor()));
- basegfx::BColor aEndColor(maBColorModifierStack.getModifiedColor(rGradient.getEndColor()));
- basegfx::B2DPolyPolygon aLocalPolyPolygon(rPolygonCandidate.getB2DPolyPolygon());
-
- if(aLocalPolyPolygon.count())
- {
- aLocalPolyPolygon.transform(maCurrentTransformation);
-
- if(aStartColor == aEndColor)
- {
- // no gradient at all, draw as polygon in AA and non-AA case
- mpOutputDevice->SetLineColor();
- mpOutputDevice->SetFillColor(Color(aStartColor));
- mpOutputDevice->DrawPolyPolygon(aLocalPolyPolygon);
- }
- else if(getOptionsDrawinglayer().IsAntiAliasing())
- {
- // For AA, direct render has to be avoided since it uses XOR maskings which will not
- // work with AA. Instead, the decompose which uses MaskPrimitive2D with fillings is
- // used
- process(rPolygonCandidate.get2DDecomposition(getViewInformation2D()));
- }
- else
- {
- static bool bSimple = false; // allow testing simple paint in debugger
-
- impDrawGradientToOutDev(
- *mpOutputDevice, aLocalPolyPolygon, rGradient.getStyle(), rGradient.getSteps(),
- aStartColor, aEndColor, rGradient.getBorder(),
- rGradient.getAngle(), rGradient.getOffsetX(), rGradient.getOffsetY(), bSimple);
- }
- }
- }
-
// direct draw of Graphic
void VclProcessor2D::RenderPolyPolygonGraphicPrimitive2D(const primitive2d::PolyPolygonGraphicPrimitive2D& rPolygonCandidate)
{
@@ -889,97 +852,6 @@ namespace drawinglayer
}
}
- // direct draw of MetaFile
- void VclProcessor2D::RenderMetafilePrimitive2D(const primitive2d::MetafilePrimitive2D& rMetaCandidate)
- {
- // decompose matrix to check for shear, rotate and mirroring
- basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * rMetaCandidate.getTransform());
- basegfx::B2DVector aScale, aTranslate;
- double fRotate, fShearX;
- aLocalTransform.decompose(aScale, aTranslate, fRotate, fShearX);
-
- if(basegfx::fTools::less(aScale.getX(), 0.0) && basegfx::fTools::less(aScale.getY(), 0.0))
- {
- // #i102175# handle special case: If scale is negative in (x,y) (3rd quadrant), it can
- // be expressed as rotation by PI. This needs to be done for Metafiles since
- // these can be rotated, but not really mirrored
- aScale = basegfx::absolute(aScale);
- fRotate += F_PI;
- }
-
- // get BoundRect
- basegfx::B2DRange aOutlineRange(rMetaCandidate.getB2DRange(getViewInformation2D()));
- aOutlineRange.transform(maCurrentTransformation);
-
- // Due to the integer MapModes used from VCL aind inside MetaFiles errors of up to three
- // pixels in size may happen. As long as there is no better way (e.g. convert the MetaFile
- // to primitives) it is necessary to reduce maximum pixel size by 1 in X and Y and to use
- // the inner pixel bounds accordingly (ceil resp. floor). This will also be done for logic
- // units e.g. when creating a new MetaFile, but since much huger value ranges are used
- // there typically will be okay for this compromize.
- Rectangle aDestRectView(
- // !!CAUTION!! Here, ceil and floor are exchanged BY PURPOSE, do NOT copy when
- // looking for a standard conversion to rectangle (!)
- (sal_Int32)ceil(aOutlineRange.getMinX()), (sal_Int32)ceil(aOutlineRange.getMinY()),
- (sal_Int32)floor(aOutlineRange.getMaxX()), (sal_Int32)floor(aOutlineRange.getMaxY()));
-
- // get metafile (copy it)
- GDIMetaFile aMetaFile;
-
- if(maBColorModifierStack.count())
- {
- const basegfx::BColor aRGBBaseColor(0, 0, 0);
- const basegfx::BColor aRGBColor(maBColorModifierStack.getModifiedColor(aRGBBaseColor));
- aMetaFile = rMetaCandidate.getMetaFile().GetMonochromeMtf(Color(aRGBColor));
- }
- else
- {
- aMetaFile = rMetaCandidate.getMetaFile();
- }
-
- // rotation
- if(!basegfx::fTools::equalZero(fRotate))
- {
- // #i103530#
- // MetaFile::Rotate has no input parameter check, so the parameter needs to be
- // well-aligned to the old range [0..3600] 10th degrees with inverse orientation
- sal_Int16 nRotation((sal_Int16)((fRotate / F_PI180) * -10.0));
-
- while(nRotation < 0)
- nRotation += 3600;
-
- while(nRotation >= 3600)
- nRotation -= 3600;
-
- aMetaFile.Rotate(nRotation);
- }
-
- // Prepare target output size
- Size aDestSize(aDestRectView.GetSize());
-
- if(aDestSize.getWidth() && aDestSize.getHeight())
- {
- // Get preferred Metafile output size. When it's very equal to the output size, it's probably
- // a rounding error somewhere, so correct it to get a 1:1 output without single pixel scalings
- // of the Metafile (esp. for contaned Bitmaps, e.g 3D charts)
- const Size aPrefSize(mpOutputDevice->LogicToPixel(aMetaFile.GetPrefSize(), aMetaFile.GetPrefMapMode()));
-
- if(aPrefSize.getWidth() && (aPrefSize.getWidth() - 1 == aDestSize.getWidth() || aPrefSize.getWidth() + 1 == aDestSize.getWidth()))
- {
- aDestSize.setWidth(aPrefSize.getWidth());
- }
-
- if(aPrefSize.getHeight() && (aPrefSize.getHeight() - 1 == aDestSize.getHeight() || aPrefSize.getHeight() + 1 == aDestSize.getHeight()))
- {
- aDestSize.setHeight(aPrefSize.getHeight());
- }
-
- // paint it
- aMetaFile.WindStart();
- aMetaFile.Play(mpOutputDevice, aDestRectView.TopLeft(), aDestSize);
- }
- }
-
// mask group. Force output to VDev and create mask from given mask
void VclProcessor2D::RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive2D& rMaskCandidate)
{