You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/05/18 12:12:56 UTC
svn commit: r1484083 [4/17] - in /openoffice/branches/ia2: ./
ext_libraries/apr/prj/ ext_libraries/coinmp/prj/ ext_libraries/ratscan/prj/
ext_libraries/serf/prj/ main/ main/avmedia/source/quicktime/
main/bridges/prj/ main/bridges/source/cpp_uno/cxx_mac...
Modified: openoffice/branches/ia2/main/cui/source/tabpages/tpshadow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/tabpages/tpshadow.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/tabpages/tpshadow.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/tabpages/tpshadow.cxx Sat May 18 10:12:43 2013
@@ -81,7 +81,7 @@ SvxShadowTabPage::SvxShadowTabPage( Wind
aMtrTransparent ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ),
aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
rOutAttrs ( rInAttrs ),
- pColorTab( NULL ),
+ maColorTab(),
bDisable ( sal_False ),
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXFillAttr ( pXPool ),
@@ -193,7 +193,7 @@ SvxShadowTabPage::SvxShadowTabPage( Wind
void SvxShadowTabPage::Construct()
{
// Farbtabelle fuellen
- aLbShadowColor.Fill( pColorTab );
+ aLbShadowColor.Fill( maColorTab );
if( bDisable )
{
@@ -222,7 +222,7 @@ void SvxShadowTabPage::ActivatePage( con
//add CHINA001 end
if( nDlgType == 0 ) //CHINA001 // Flaechen-Dialogif( *pDlgType == 0 ) // Flaechen-Dialog
{
- if( pColorTab )
+ if( maColorTab.get() )
{
// ColorTable
if( *pnColorTableState & CT_CHANGED ||
@@ -233,20 +233,20 @@ void SvxShadowTabPage::ActivatePage( con
SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN );
if( pArea )
{
- pColorTab = pArea->GetNewColorTable();
+ maColorTab = pArea->GetNewColorTable();
}
else
{
SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN );
if( pLine )
- pColorTab = pLine->GetNewColorTable();
+ maColorTab = pLine->GetNewColorTable();
}
}
// aLbShadowColor
nPos = aLbShadowColor.GetSelectEntryPos();
aLbShadowColor.Clear();
- aLbShadowColor.Fill( pColorTab );
+ aLbShadowColor.Fill( maColorTab );
nCount = aLbShadowColor.GetEntryCount();
if( nCount == 0 )
; // Dieser Fall sollte nicht auftreten
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_005.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_005_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_110.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_110_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_250.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_250_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_260.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_260_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_400.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_400_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_450.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_450_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_500.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_500_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_505.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_505_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_750.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorderLineStyle_750_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_All_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_All_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Bottom_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Bottom_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Empty_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Empty_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_FourBorders_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_FourBorders_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Left_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Left_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Right_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Right_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Top_18x18.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/CellBorder_Top_18x18_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/Line_color.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/fill_color.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/fill_color_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/morebutton.bmp
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/morebutton_h.bmp
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/sc_alignbottom.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/sc_aligncenter.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/sc_aligncenter_v.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/sc_alignjust.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/sc_alignleft.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/sc_alignright.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sc/res/sidebar/sc_aligntop.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/grip.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/grip_hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/menu.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/menu_hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/separator.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/morebutton.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/morebutton_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/open_more.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-3d-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-3d-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-3d-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-3d-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-animation-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-animation-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-animation-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-animation-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-colors-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-colors-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-colors-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-colors-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-eyedropper-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-eyedropper-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-eyedropper-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-eyedropper-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-gallery-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-gallery-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-gallery-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-gallery-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-imganim-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-imganim-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-imganim-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-imganim-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-navigator-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-navigator-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-navigator-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-navigator-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-property-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-property-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-property-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-property-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-style-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-style-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-style-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-style-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-template-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-template-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-template-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-template-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-transition-large-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-transition-large.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-transition-small-hc.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sfx2/res/symphony/sidebar-transition-small.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/rotation.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/rotation_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/AdjustColorBlue_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/AdjustColorGamma_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/AdjustColorGreen_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/AdjustColorRed_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/ColorModeGrey_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/ColorModeNormal_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/DecreaseSpace_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/Highlight.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/IncreaseSpace_16x16.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/Indent2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/Indent3.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/Indent4.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/Indent_Hanging.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/Line_color.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/Quadratic.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/Square.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/Square_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/__morebutton.bmp
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/__morebutton_h.bmp
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/axial.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/axial_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/blank.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/decrease font.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/ellipsoid.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/ellipsoid_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/enlarge font.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/fill_color.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/fill_color_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/icon_normal.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/last_custom_common.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/last_custom_common_grey.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line10.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line10_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line1_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line2_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line3.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line3_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line4.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line4_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line5.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line5_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line6.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line6_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line7.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line7_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line8.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line8_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line9.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/line9_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/linear.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/linear_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/lpselected-spacing-1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/lpselected-spacing-1_15.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/lpselected-spacing-1_5.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/lpselected-spacing-2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/lpsmall-spacing-1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/lpspacing-1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/lpspacing-1_15.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/lpspacing-1_5.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/lpspacing-2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/no color.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/para_numbullet01.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/para_numbullet02.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/para_numbullet_rtl01.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/para_numbullet_rtl02.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/para_numbulleth01.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/para_numbulleth02.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/radial.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/radial_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/rotate_left.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/rotate_right.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/rotation.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/rotation_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sc_backgroundcolor.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sc_bold.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sc_color.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sc_italic.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sc_shadowed.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sc_strikeout.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sc_subscript.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sc_superscript.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sc_underline.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/sch_backgroundcolor.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line10.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line3.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line4.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line5.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line6.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line7.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line8.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/selected-line9.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing3.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_loose.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_loose_s.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_normal.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_normal_s.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_tight.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_tight_s.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_very loose.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_very loose_s.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_very tight.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/spacing_very tight_s.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width1_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width2_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width3.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width3_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width4.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width4_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width5.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width5_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width6.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width6_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width7.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width7_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width8.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/svx/res/symphony/width8_h.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
('svn:executable' removed)
Modified: openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx Sat May 18 10:12:43 2013
@@ -95,6 +95,9 @@ namespace drawinglayer
class SvgGradientHelper
{
private:
+ /// the extra gradient transform
+ basegfx::B2DHomMatrix maGradientTransform;
+
/// geometric definition, the geometry to be filled
basegfx::B2DPolyPolygon maPolyPolygon;
@@ -149,6 +152,7 @@ namespace drawinglayer
public:
/// constructor
SvgGradientHelper(
+ const basegfx::B2DHomMatrix& rGradientTransform,
const basegfx::B2DPolyPolygon& rPolyPolygon,
const SvgGradientEntryVector& rGradientEntries,
const basegfx::B2DPoint& rStart,
@@ -156,6 +160,7 @@ namespace drawinglayer
SpreadMethod aSpreadMethod = Spread_pad);
/// data read access
+ const basegfx::B2DHomMatrix& getGradientTransform() const { return maGradientTransform; }
const basegfx::B2DPolyPolygon& getPolyPolygon() const { return maPolyPolygon; }
const SvgGradientEntryVector& getGradientEntries() const { return maGradientEntries; }
const basegfx::B2DPoint& getStart() const { return maStart; }
@@ -198,6 +203,7 @@ namespace drawinglayer
public:
/// constructor
SvgLinearGradientPrimitive2D(
+ const basegfx::B2DHomMatrix& rGradientTransform,
const basegfx::B2DPolyPolygon& rPolyPolygon,
const SvgGradientEntryVector& rGradientEntries,
const basegfx::B2DPoint& rStart,
@@ -266,6 +272,7 @@ namespace drawinglayer
public:
/// constructor
SvgRadialGradientPrimitive2D(
+ const basegfx::B2DHomMatrix& rGradientTransform,
const basegfx::B2DPolyPolygon& rPolyPolygon,
const SvgGradientEntryVector& rGradientEntries,
const basegfx::B2DPoint& rStart,
Modified: openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx Sat May 18 10:12:43 2013
@@ -29,6 +29,15 @@
#include <vcl/outdev.hxx>
//////////////////////////////////////////////////////////////////////////////
+// predefines
+
+namespace drawinglayer { namespace primitive2d {
+ class PolyPolygonColorPrimitive2D;
+ class PolygonHairlinePrimitive2D;
+ class PolygonStrokePrimitive2D;
+}}
+
+//////////////////////////////////////////////////////////////////////////////
namespace drawinglayer
{
@@ -49,6 +58,11 @@ namespace drawinglayer
*/
virtual void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate);
+ // some helpers to try direct paints (shortcuts)
+ bool tryDrawPolyPolygonColorPrimitive2DDirect(const drawinglayer::primitive2d::PolyPolygonColorPrimitive2D& rSource, double fTransparency);
+ bool tryDrawPolygonHairlinePrimitive2DDirect(const drawinglayer::primitive2d::PolygonHairlinePrimitive2D& rSource, double fTransparency);
+ bool tryDrawPolygonStrokePrimitive2DDirect(const drawinglayer::primitive2d::PolygonStrokePrimitive2D& rSource, double fTransparency);
+
public:
/// constructor/destructor
VclPixelProcessor2D(
Modified: openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx Sat May 18 10:12:43 2013
@@ -41,7 +41,6 @@ namespace drawinglayer { namespace primi
class FillGraphicPrimitive2D;
class PolyPolygonGradientPrimitive2D;
class PolyPolygonGraphicPrimitive2D;
- class PolyPolygonColorPrimitive2D;
class MetafilePrimitive2D;
class MaskPrimitive2D;
class UnifiedTransparencePrimitive2D;
@@ -98,7 +97,6 @@ namespace drawinglayer
void RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate);
void RenderFillGraphicPrimitive2D(const primitive2d::FillGraphicPrimitive2D& rFillBitmapCandidate);
void RenderPolyPolygonGraphicPrimitive2D(const primitive2d::PolyPolygonGraphicPrimitive2D& rPolygonCandidate);
- void RenderPolyPolygonColorPrimitive2D(const primitive2d::PolyPolygonColorPrimitive2D& rPolygonCandidate);
void RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive2D& rMaskCandidate);
void RenderModifiedColorPrimitive2D(const primitive2d::ModifiedColorPrimitive2D& rModifiedCandidate);
void RenderUnifiedTransparencePrimitive2D(const primitive2d::UnifiedTransparencePrimitive2D& rTransCandidate);
Modified: openoffice/branches/ia2/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx Sat May 18 10:12:43 2013
@@ -285,12 +285,14 @@ namespace drawinglayer
}
SvgGradientHelper::SvgGradientHelper(
+ const basegfx::B2DHomMatrix& rGradientTransform,
const basegfx::B2DPolyPolygon& rPolyPolygon,
const SvgGradientEntryVector& rGradientEntries,
const basegfx::B2DPoint& rStart,
bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod)
- : maPolyPolygon(rPolyPolygon),
+ : maGradientTransform(rGradientTransform),
+ maPolyPolygon(rPolyPolygon),
maGradientEntries(rGradientEntries),
maStart(rStart),
maSpreadMethod(aSpreadMethod),
@@ -306,7 +308,8 @@ namespace drawinglayer
{
const SvgGradientHelper& rCompare = static_cast< const SvgGradientHelper& >(rSvgGradientHelper);
- return (getPolyPolygon() == rCompare.getPolyPolygon()
+ return (getGradientTransform() == rCompare.getGradientTransform()
+ && getPolyPolygon() == rCompare.getPolyPolygon()
&& getGradientEntries() == rCompare.getGradientEntries()
&& getStart() == rCompare.getStart()
&& getUseUnitCoordinates() == rCompare.getUseUnitCoordinates()
@@ -410,15 +413,19 @@ namespace drawinglayer
// gradient vector defined by Start,End
const basegfx::B2DVector aVector(getEnd() - getStart());
const double fVectorLength(aVector.getLength());
- basegfx::B2DHomMatrix aUnitGradientToGradient;
- aUnitGradientToGradient.scale(fVectorLength, 1.0);
- aUnitGradientToGradient.rotate(atan2(aVector.getY(), aVector.getX()));
- aUnitGradientToGradient.translate(getStart().getX(), getStart().getY());
+ aUnitGradientToObject.scale(fVectorLength, 1.0);
+ aUnitGradientToObject.rotate(atan2(aVector.getY(), aVector.getX()));
+ aUnitGradientToObject.translate(getStart().getX(), getStart().getY());
+
+ if(!getGradientTransform().isIdentity())
+ {
+ aUnitGradientToObject = getGradientTransform() * aUnitGradientToObject;
+ }
// create full transform from unit gradient coordinates to object coordinates
// including the SvgGradient transformation
- aUnitGradientToObject = aObjectTransform * aUnitGradientToGradient;
+ aUnitGradientToObject = aObjectTransform * aUnitGradientToObject;
}
else
{
@@ -430,6 +437,11 @@ namespace drawinglayer
aUnitGradientToObject.scale(aVector.getLength(), 1.0);
aUnitGradientToObject.rotate(atan2(aVector.getY(), aVector.getX()));
aUnitGradientToObject.translate(aStart.getX(), aStart.getY());
+
+ if(!getGradientTransform().isIdentity())
+ {
+ aUnitGradientToObject = getGradientTransform() * aUnitGradientToObject;
+ }
}
// create inverse from it
@@ -550,6 +562,7 @@ namespace drawinglayer
}
SvgLinearGradientPrimitive2D::SvgLinearGradientPrimitive2D(
+ const basegfx::B2DHomMatrix& rGradientTransform,
const basegfx::B2DPolyPolygon& rPolyPolygon,
const SvgGradientEntryVector& rGradientEntries,
const basegfx::B2DPoint& rStart,
@@ -557,7 +570,7 @@ namespace drawinglayer
bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod)
: BufferedDecompositionPrimitive2D(),
- SvgGradientHelper(rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod),
+ SvgGradientHelper(rGradientTransform, rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod),
maEnd(rEnd)
{
}
@@ -741,23 +754,33 @@ namespace drawinglayer
{
// interpret in unit coordinate system -> object aspect ratio will scale result
// create unit transform from unit vector to given linear gradient vector
- basegfx::B2DHomMatrix aUnitGradientToGradient;
+ aUnitGradientToObject.scale(getRadius(), getRadius());
+ aUnitGradientToObject.translate(getStart().getX(), getStart().getY());
- aUnitGradientToGradient.scale(getRadius(), getRadius());
- aUnitGradientToGradient.translate(getStart().getX(), getStart().getY());
+ if(!getGradientTransform().isIdentity())
+ {
+ aUnitGradientToObject = getGradientTransform() * aUnitGradientToObject;
+ }
// create full transform from unit gradient coordinates to object coordinates
// including the SvgGradient transformation
- aUnitGradientToObject = aObjectTransform * aUnitGradientToGradient;
+ aUnitGradientToObject = aObjectTransform * aUnitGradientToObject;
}
else
{
// interpret in object coordinate system -> object aspect ratio will not scale result
+ // use X-Axis with radius, it was already made relative to object width when coming from
+ // SVG import
const double fRadius((aObjectTransform * basegfx::B2DVector(getRadius(), 0.0)).getLength());
const basegfx::B2DPoint aStart(aObjectTransform * getStart());
aUnitGradientToObject.scale(fRadius, fRadius);
aUnitGradientToObject.translate(aStart.getX(), aStart.getY());
+
+ if(!getGradientTransform().isIdentity())
+ {
+ aUnitGradientToObject = getGradientTransform() * aUnitGradientToObject;
+ }
}
// create inverse from it
@@ -827,6 +850,7 @@ namespace drawinglayer
}
SvgRadialGradientPrimitive2D::SvgRadialGradientPrimitive2D(
+ const basegfx::B2DHomMatrix& rGradientTransform,
const basegfx::B2DPolyPolygon& rPolyPolygon,
const SvgGradientEntryVector& rGradientEntries,
const basegfx::B2DPoint& rStart,
@@ -835,7 +859,7 @@ namespace drawinglayer
SpreadMethod aSpreadMethod,
const basegfx::B2DPoint* pFocal)
: BufferedDecompositionPrimitive2D(),
- SvgGradientHelper(rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod),
+ SvgGradientHelper(rGradientTransform, rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod),
mfRadius(fRadius),
maFocal(rStart),
maFocalVector(0.0, 0.0),
Modified: openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx Sat May 18 10:12:43 2013
@@ -1342,7 +1342,10 @@ namespace drawinglayer
}
case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D :
{
- // direct draw of transformed BitmapEx primitive; use default processing
+ // direct draw of transformed BitmapEx primitive; use default processing, but without
+ // former testing if graphic content is inside discrete local viewport; this is not
+ // setup for metafile targets (metafile renderer tries to render in logic coordinates,
+ // the mapping is kept to the OutputDevice for better Metafile recording)
RenderBitmapPrimitive2D(static_cast< const primitive2d::BitmapPrimitive2D& >(rCandidate));
break;
}
Modified: openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx Sat May 18 10:12:43 2013
@@ -99,6 +99,141 @@ namespace drawinglayer
mpOutputDevice->SetAntialiasing(mpOutputDevice->GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
}
+ bool VclPixelProcessor2D::tryDrawPolyPolygonColorPrimitive2DDirect(const drawinglayer::primitive2d::PolyPolygonColorPrimitive2D& rSource, double fTransparency)
+ {
+ basegfx::B2DPolyPolygon aLocalPolyPolygon(rSource.getB2DPolyPolygon());
+
+ if(!aLocalPolyPolygon.count())
+ {
+ // no geometry, done
+ return true;
+ }
+
+ const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rSource.getBColor()));
+
+ mpOutputDevice->SetFillColor(Color(aPolygonColor));
+ mpOutputDevice->SetLineColor();
+ aLocalPolyPolygon.transform(maCurrentTransformation);
+ mpOutputDevice->DrawTransparent(
+ aLocalPolyPolygon,
+ fTransparency);
+
+ return true;
+ }
+
+ bool VclPixelProcessor2D::tryDrawPolygonHairlinePrimitive2DDirect(const drawinglayer::primitive2d::PolygonHairlinePrimitive2D& rSource, double fTransparency)
+ {
+ basegfx::B2DPolygon aLocalPolygon(rSource.getB2DPolygon());
+
+ if(!aLocalPolygon.count())
+ {
+ // no geometry, done
+ return true;
+ }
+
+ const basegfx::BColor aLineColor(maBColorModifierStack.getModifiedColor(rSource.getBColor()));
+
+ mpOutputDevice->SetFillColor();
+ mpOutputDevice->SetLineColor(Color(aLineColor));
+ aLocalPolygon.transform(maCurrentTransformation);
+
+ // try drawing; if it did not work, use standard fallback
+ if(mpOutputDevice->TryDrawPolyLineDirect(
+ aLocalPolygon,
+ 0.0,
+ fTransparency))
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ bool VclPixelProcessor2D::tryDrawPolygonStrokePrimitive2DDirect(const drawinglayer::primitive2d::PolygonStrokePrimitive2D& rSource, double fTransparency)
+ {
+ basegfx::B2DPolygon aLocalPolygon(rSource.getB2DPolygon());
+
+ if(!aLocalPolygon.count())
+ {
+ // no geometry, done
+ return true;
+ }
+
+ aLocalPolygon = basegfx::tools::simplifyCurveSegments(aLocalPolygon);
+ basegfx::B2DPolyPolygon aHairLinePolyPolygon;
+
+ if(rSource.getStrokeAttribute().isDefault() || 0.0 == rSource.getStrokeAttribute().getFullDotDashLen())
+ {
+ // no line dashing, just copy
+ aHairLinePolyPolygon.append(aLocalPolygon);
+ }
+ else
+ {
+ // apply LineStyle
+ basegfx::tools::applyLineDashing(
+ aLocalPolygon,
+ rSource.getStrokeAttribute().getDotDashArray(),
+ &aHairLinePolyPolygon,
+ 0,
+ rSource.getStrokeAttribute().getFullDotDashLen());
+ }
+
+ if(!aHairLinePolyPolygon.count())
+ {
+ // no geometry, done
+ return true;
+ }
+
+ const basegfx::BColor aLineColor(
+ maBColorModifierStack.getModifiedColor(
+ rSource.getLineAttribute().getColor()));
+
+ mpOutputDevice->SetFillColor();
+ mpOutputDevice->SetLineColor(Color(aLineColor));
+ aHairLinePolyPolygon.transform(maCurrentTransformation);
+
+ double fLineWidth(rSource.getLineAttribute().getWidth());
+
+ if(basegfx::fTools::more(fLineWidth, 0.0))
+ {
+ basegfx::B2DVector aLineWidth(fLineWidth, 0.0);
+
+ aLineWidth = maCurrentTransformation * aLineWidth;
+ fLineWidth = aLineWidth.getLength();
+ }
+
+ bool bHasPoints(false);
+ bool bTryWorked(false);
+
+ for(sal_uInt32 a(0); a < aHairLinePolyPolygon.count(); a++)
+ {
+ const basegfx::B2DPolygon aSingle(aHairLinePolyPolygon.getB2DPolygon(a));
+
+ if(aSingle.count())
+ {
+ bHasPoints = true;
+
+ if(mpOutputDevice->TryDrawPolyLineDirect(
+ aSingle,
+ fLineWidth,
+ fTransparency,
+ rSource.getLineAttribute().getLineJoin(),
+ rSource.getLineAttribute().getLineCap()))
+ {
+ bTryWorked = true;
+ }
+ }
+ }
+
+ if(!bTryWorked && !bHasPoints)
+ {
+ // no geometry despite try
+ bTryWorked = true;
+ }
+
+ return bTryWorked;
+ }
+
void VclPixelProcessor2D::processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate)
{
switch(rCandidate.getPrimitive2DID())
@@ -176,13 +311,41 @@ namespace drawinglayer
}
case PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D :
{
- // direct draw of hairline
- RenderPolygonHairlinePrimitive2D(static_cast< const primitive2d::PolygonHairlinePrimitive2D& >(rCandidate), true);
+ // try to use directly
+ const primitive2d::PolygonHairlinePrimitive2D& rPolygonHairlinePrimitive2D = static_cast< const primitive2d::PolygonHairlinePrimitive2D& >(rCandidate);
+ static bool bAllowed(true);
+
+ if(bAllowed && tryDrawPolygonHairlinePrimitive2DDirect(rPolygonHairlinePrimitive2D, 0.0))
+ {
+ break;
+ }
+
+ // direct draw of hairline
+ RenderPolygonHairlinePrimitive2D(rPolygonHairlinePrimitive2D, true);
break;
}
case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D :
{
- // direct draw of transformed BitmapEx primitive
+ // direct draw of transformed BitmapEx primitive
+ const primitive2d::BitmapPrimitive2D& rBitmapCandidate = static_cast< const primitive2d::BitmapPrimitive2D& >(rCandidate);
+
+ // check if graphic content is inside discrete local ViewPort
+ const basegfx::B2DRange& rDiscreteViewPort(getViewInformation2D().getDiscreteViewport());
+ const basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * rBitmapCandidate.getTransform());
+
+ if(!rDiscreteViewPort.isEmpty())
+ {
+ basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0);
+
+ aUnitRange.transform(aLocalTransform);
+
+ if(!aUnitRange.overlaps(rDiscreteViewPort))
+ {
+ // content is outside discrete local ViewPort
+ break;
+ }
+ }
+
RenderBitmapPrimitive2D(static_cast< const primitive2d::BitmapPrimitive2D& >(rCandidate));
break;
}
@@ -228,8 +391,53 @@ namespace drawinglayer
}
case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D :
{
- // direct draw of PolyPolygon with color
- RenderPolyPolygonColorPrimitive2D(static_cast< const primitive2d::PolyPolygonColorPrimitive2D& >(rCandidate));
+ // try to use directly
+ const primitive2d::PolyPolygonColorPrimitive2D& rPolyPolygonColorPrimitive2D = static_cast< const primitive2d::PolyPolygonColorPrimitive2D& >(rCandidate);
+ basegfx::B2DPolyPolygon aLocalPolyPolygon;
+ static bool bAllowed(true);
+
+ if(bAllowed && tryDrawPolyPolygonColorPrimitive2DDirect(rPolyPolygonColorPrimitive2D, 0.0))
+ {
+ // okay, done. In this case no gaps should have to be repaired, too
+ }
+ else
+ {
+ // direct draw of PolyPolygon with color
+ const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rPolyPolygonColorPrimitive2D.getBColor()));
+
+ mpOutputDevice->SetFillColor(Color(aPolygonColor));
+ mpOutputDevice->SetLineColor();
+ aLocalPolyPolygon = rPolyPolygonColorPrimitive2D.getB2DPolyPolygon();
+ aLocalPolyPolygon.transform(maCurrentTransformation);
+ mpOutputDevice->DrawPolyPolygon(aLocalPolyPolygon);
+ }
+
+ // when AA is on and this filled polygons are the result of stroked line geometry,
+ // draw the geometry once extra as lines to avoid AA 'gaps' between partial polygons
+ // Caution: This is needed in both cases (!)
+ if(mnPolygonStrokePrimitive2D
+ && getOptionsDrawinglayer().IsAntiAliasing()
+ && (mpOutputDevice->GetAntialiasing() & ANTIALIASING_ENABLE_B2DDRAW))
+ {
+ const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rPolyPolygonColorPrimitive2D.getBColor()));
+ sal_uInt32 nCount(aLocalPolyPolygon.count());
+
+ if(!nCount)
+ {
+ aLocalPolyPolygon = rPolyPolygonColorPrimitive2D.getB2DPolyPolygon();
+ aLocalPolyPolygon.transform(maCurrentTransformation);
+ nCount = aLocalPolyPolygon.count();
+ }
+
+ mpOutputDevice->SetFillColor();
+ mpOutputDevice->SetLineColor(Color(aPolygonColor));
+
+ for(sal_uInt32 a(0); a < nCount; a++)
+ {
+ mpOutputDevice->DrawPolyLine(aLocalPolyPolygon.getB2DPolygon(a), 0.0);
+ }
+ }
+
break;
}
case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
@@ -298,28 +506,44 @@ namespace drawinglayer
{
case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D:
{
- // single transparent PolyPolygon identified, use directly
- const primitive2d::PolyPolygonColorPrimitive2D* pPoPoColor = static_cast< const primitive2d::PolyPolygonColorPrimitive2D* >(pBasePrimitive);
- OSL_ENSURE(pPoPoColor, "OOps, PrimitiveID and PrimitiveType do not match (!)");
- const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(pPoPoColor->getBColor()));
- mpOutputDevice->SetFillColor(Color(aPolygonColor));
- mpOutputDevice->SetLineColor();
-
- basegfx::B2DPolyPolygon aLocalPolyPolygon(pPoPoColor->getB2DPolyPolygon());
- aLocalPolyPolygon.transform(maCurrentTransformation);
-
- mpOutputDevice->DrawTransparent(aLocalPolyPolygon, rUniTransparenceCandidate.getTransparence());
- bDrawTransparentUsed = true;
- break;
- }
- // #i# need to wait for #i101378# which is in CWS vcl112 to directly paint transparent hairlines
- //case PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D:
- //{
- // // single transparent PolygonHairlinePrimitive2D identified, use directly
- // const primitive2d::PolygonHairlinePrimitive2D* pPoHair = static_cast< const primitive2d::PolygonHairlinePrimitive2D* >(pBasePrimitive);
- // OSL_ENSURE(pPoHair, "OOps, PrimitiveID and PrimitiveType do not match (!)");
- // break;
- //}
+ // single transparent PolyPolygon identified, use directly
+ const primitive2d::PolyPolygonColorPrimitive2D* pPoPoColor = static_cast< const primitive2d::PolyPolygonColorPrimitive2D* >(pBasePrimitive);
+ OSL_ENSURE(pPoPoColor, "OOps, PrimitiveID and PrimitiveType do not match (!)");
+ bDrawTransparentUsed = tryDrawPolyPolygonColorPrimitive2DDirect(*pPoPoColor, rUniTransparenceCandidate.getTransparence());
+ break;
+ }
+ case PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D:
+ {
+ // single transparent PolygonHairlinePrimitive2D identified, use directly
+ const primitive2d::PolygonHairlinePrimitive2D* pPoHair = static_cast< const primitive2d::PolygonHairlinePrimitive2D* >(pBasePrimitive);
+ OSL_ENSURE(pPoHair, "OOps, PrimitiveID and PrimitiveType do not match (!)");
+
+ // do no tallow by default - problem is that self-overlapping parts of this geometry will
+ // not be in a all-same transparency but will already alpha-cover themselves with blending.
+ // This is not what the UnifiedTransparencePrimitive2D defines: It requires all it's
+ // content to be uniformely transparent.
+ // For hairline the effect is pretty minimal, but still not correct.
+ static bool bAllowed(false);
+
+ bDrawTransparentUsed = bAllowed && tryDrawPolygonHairlinePrimitive2DDirect(*pPoHair, rUniTransparenceCandidate.getTransparence());
+ break;
+ }
+ case PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D:
+ {
+ // single transparent PolygonStrokePrimitive2D identified, use directly
+ const primitive2d::PolygonStrokePrimitive2D* pPoStroke = static_cast< const primitive2d::PolygonStrokePrimitive2D* >(pBasePrimitive);
+ OSL_ENSURE(pPoStroke, "OOps, PrimitiveID and PrimitiveType do not match (!)");
+
+ // do no tallow by default - problem is that self-overlapping parts of this geometry will
+ // not be in a all-same transparency but will already alpha-cover themselves with blending.
+ // This is not what the UnifiedTransparencePrimitive2D defines: It requires all it's
+ // content to be uniformely transparent.
+ // To check, acitvate and draw a wide transparent self-crossing line/curve
+ static bool bAllowed(false);
+
+ bDrawTransparentUsed = bAllowed && tryDrawPolygonStrokePrimitive2DDirect(*pPoStroke, rUniTransparenceCandidate.getTransparence());
+ break;
+ }
}
}
}
@@ -419,6 +643,14 @@ namespace drawinglayer
}
case PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D:
{
+ // try to use directly
+ const primitive2d::PolygonStrokePrimitive2D& rPolygonStrokePrimitive2D = static_cast< const primitive2d::PolygonStrokePrimitive2D& >(rCandidate);
+
+ if(tryDrawPolygonStrokePrimitive2DDirect(rPolygonStrokePrimitive2D, 0.0))
+ {
+ break;
+ }
+
// the stroke primitive may be decomposed to filled polygons. To keep
// evtl. set DrawModes aka DRAWMODE_BLACKLINE, DRAWMODE_GRAYLINE,
// DRAWMODE_GHOSTEDLINE, DRAWMODE_WHITELINE or DRAWMODE_SETTINGSLINE
@@ -447,9 +679,7 @@ namespace drawinglayer
// as filled polygons is geometrically corret but looks wrong since polygon filling avoids
// the right and bottom pixels. The used method evaluates that and takes the correct action,
// including calling recursively with decomposition if line is wide enough
- const primitive2d::PolygonStrokePrimitive2D& rPolygonStrokePrimitive = static_cast< const primitive2d::PolygonStrokePrimitive2D& >(rCandidate);
-
- RenderPolygonStrokePrimitive2D(rPolygonStrokePrimitive);
+ RenderPolygonStrokePrimitive2D(rPolygonStrokePrimitive2D);
}
// restore DrawMode
Modified: openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx Sat May 18 10:12:43 2013
@@ -387,24 +387,8 @@ namespace drawinglayer
// direct draw of transformed BitmapEx primitive
void VclProcessor2D::RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate)
{
- // 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());
+ const basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * rBitmapCandidate.getTransform());
if(maBColorModifierStack.count())
{
@@ -772,86 +756,6 @@ namespace drawinglayer
}
}
- // direct draw of PolyPolygon with color
- void VclProcessor2D::RenderPolyPolygonColorPrimitive2D(const primitive2d::PolyPolygonColorPrimitive2D& rPolygonCandidate)
- {
- const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rPolygonCandidate.getBColor()));
- mpOutputDevice->SetFillColor(Color(aPolygonColor));
- mpOutputDevice->SetLineColor();
-
- basegfx::B2DPolyPolygon aLocalPolyPolygon(rPolygonCandidate.getB2DPolyPolygon());
- aLocalPolyPolygon.transform(maCurrentTransformation);
-
- static bool bCheckTrapezoidDecomposition(false);
- static bool bShowOutlinesThere(false);
- if(bCheckTrapezoidDecomposition)
- {
- // clip against discrete ViewPort
- const basegfx::B2DRange& rDiscreteViewport = getViewInformation2D().getDiscreteViewport();
- aLocalPolyPolygon = basegfx::tools::clipPolyPolygonOnRange(
- aLocalPolyPolygon, rDiscreteViewport, true, false);
-
- if(aLocalPolyPolygon.count())
- {
- // subdivide
- aLocalPolyPolygon = basegfx::tools::adaptiveSubdivideByDistance(
- aLocalPolyPolygon, 0.5);
-
- // trapezoidize
- basegfx::B2DTrapezoidVector aB2DTrapezoidVector;
- basegfx::tools::trapezoidSubdivide(aB2DTrapezoidVector, aLocalPolyPolygon);
-
- const sal_uInt32 nCount(aB2DTrapezoidVector.size());
-
- if(nCount)
- {
- basegfx::BColor aInvPolygonColor(aPolygonColor);
- aInvPolygonColor.invert();
-
- for(sal_uInt32 a(0); a < nCount; a++)
- {
- const basegfx::B2DPolygon aTempPolygon(aB2DTrapezoidVector[a].getB2DPolygon());
-
- if(bShowOutlinesThere)
- {
- mpOutputDevice->SetFillColor(Color(aPolygonColor));
- mpOutputDevice->SetLineColor();
- }
-
- mpOutputDevice->DrawPolygon(aTempPolygon);
-
- if(bShowOutlinesThere)
- {
- mpOutputDevice->SetFillColor();
- mpOutputDevice->SetLineColor(Color(aInvPolygonColor));
- mpOutputDevice->DrawPolyLine(aTempPolygon, 0.0);
- }
- }
- }
- }
- }
- else
- {
- mpOutputDevice->DrawPolyPolygon(aLocalPolyPolygon);
-
- if(mnPolygonStrokePrimitive2D
- && getOptionsDrawinglayer().IsAntiAliasing()
- && (mpOutputDevice->GetAntialiasing() & ANTIALIASING_ENABLE_B2DDRAW))
- {
- // when AA is on and this filled polygons are the result of stroked line geometry,
- // draw the geometry once extra as lines to avoid AA 'gaps' between partial polygons
- mpOutputDevice->SetFillColor();
- mpOutputDevice->SetLineColor(Color(aPolygonColor));
- const sal_uInt32 nCount(aLocalPolyPolygon.count());
-
- for(sal_uInt32 a(0); a < nCount; a++)
- {
- mpOutputDevice->DrawPolyLine(aLocalPolyPolygon.getB2DPolygon(a), 0.0);
- }
- }
- }
- }
-
// mask group. Force output to VDev and create mask from given mask
void VclProcessor2D::RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive2D& rMaskCandidate)
{
Modified: openoffice/branches/ia2/main/extensions.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions.lst?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions.lst (original)
+++ openoffice/branches/ia2/main/extensions.lst Sat May 18 10:12:43 2013
@@ -96,7 +96,7 @@
# Scottish Gaelic.
[ language=gd ]
- d645b36c5d4fc52c18ac180453b48b5c http://sourceforge.net/projects/aoo-extensions/files/4587/7/hunspell-gd-2.5.oxt/download "hunspell-gd-2.5.oxt"
+ 867d5509958a867fec1096b445fe4cec http://sourceforge.net/projects/aoo-extensions/files/4587/8/hunspell-gd-2.6.oxt/download "hunspell-gd-2.6.oxt"
# Basque.
[ language=eu ]
@@ -113,7 +113,7 @@
# Norwegian.
[ language=nb ]
- 18bbb57caee07d276ef21a0e88859664 http://sourceforge.net/projects/aoo-extensions/files/5955/0/dict-no-ooo330.oxt/download "dict-no-ooo330.oxt"
+ e6ca009bc6aa3d70d8b7d66138b1c28d http://sourceforge.net/projects/aoo-extensions/files/1216/6/dictionary-no-NO-2.1.oxt/download "dictionary-no-NO-2.1.oxt"
# Swedish.
[ language=sv ]
Modified: openoffice/branches/ia2/main/extensions/source/propctrlr/standardcontrol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/propctrlr/standardcontrol.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/propctrlr/standardcontrol.cxx (original)
+++ openoffice/branches/ia2/main/extensions/source/propctrlr/standardcontrol.cxx Sat May 18 10:12:43 2013
@@ -682,28 +682,27 @@ namespace pcr
:OColorControl_Base( PropertyControlType::ColorListBox, pParent, nWinStyle )
{
// initialize the color listbox
- XColorList* pColorTable = NULL;
+ XColorListSharedPtr aColorTable;
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = pDocSh ? pDocSh->GetItem( SID_COLOR_TABLE ) : NULL;
if ( pItem )
{
DBG_ASSERT(pItem->ISA(SvxColorTableItem), "OColorControl::OColorControl: invalid color item!");
- pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
+ aColorTable = static_cast< const SvxColorTableItem* >(pItem)->GetColorTable();
}
- if ( !pColorTable )
+ if ( !aColorTable.get() )
{
- pColorTable = XColorList::GetStdColorList();
+ aColorTable = XColorList::GetStdColorList();
}
-
- DBG_ASSERT(pColorTable, "OColorControl::OColorControl: no color table!");
+ DBG_ASSERT(aColorTable.get(), "OColorControl::OColorControl: no color table!");
- if (pColorTable)
+ if (aColorTable.get())
{
- for (sal_uInt16 i = 0; i < pColorTable->Count(); ++i)
+ for (sal_uInt16 i = 0; i < aColorTable->Count(); ++i)
{
- XColorEntry* pEntry = pColorTable->GetColor( i );
+ XColorEntry* pEntry = aColorTable->GetColor( i );
getTypedControlWindow()->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
}
Modified: openoffice/branches/ia2/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/external_deps.lst?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/external_deps.lst (original)
+++ openoffice/branches/ia2/main/external_deps.lst Sat May 18 10:12:43 2013
@@ -217,9 +217,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
- MD5 = c57477edd6d18bd9eeca2f21add73919
- name = Python-2.7.3.tar.bz2
- URL1 = http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2
+ MD5 = 62704ea0f125923208d84ff0568f7d50
+ name = Python-2.7.4.tar.bz2
+ URL1 = http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A16-CircleArrow.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A17-CircleArrow.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A18-CircleArrow.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A19-CircleArrow.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A26-CurvedArrow-Orange.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A27-CurvedArrow-DarkRed.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A28-CurvedArrow-DarkBlue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A29-CurvedArrow-Green.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A44-TrendArrow-Orange-GoUp.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A45-TrendArrow-Red-GoUp.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/arrows/A47-TrendArrow-LightBlue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Computer-Cloud.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Computer-Desktop.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Computer-Laptop-Black.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Computer-Laptop-Silver.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Database-Add.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Database-Delete.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Database-Download.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Database.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Folder01-Blue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Folder02-Green.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Folder03-Manilla.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Folder04-Yellow.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Folder05-OpenBlue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Folder06-OpenGreen.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Folder07-OpenManilla.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Folder08-OpenYellow.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/Server.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/computers/WirelessAccessPoint.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/Blackboard.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/Books.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/Chalk.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/Globe.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/Glue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/GraduationCap.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/Microscope.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/Notebook.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/PaperClip-Blue.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/PaperClip-Red.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/Pencil.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/Ruler.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/education/TestTubes.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/DrippingFaucet.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/Earth.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/EndangeredAnimals1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/EndangeredAnimals2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/GreenCar.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/GreenFactory.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/GreenHouse.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/Leaf1.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/Leaf2.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/LightBulb-Flourescent-Off.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/LightBulb-Flourescent-On.png
('svn:executable' removed)
Propchange: openoffice/branches/ia2/main/extras/source/gallery/environment/LightBulb-Standard-Off1.png
('svn:executable' removed)