Modified: openoffice/branches/ia2/main/vcl/source/control/lstbox.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/control/lstbox.cxx?rev=1476499&r1=1476498&r2=1476499&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/control/lstbox.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/control/lstbox.cxx Sat Apr 27 05:51:13 2013 @@ -99,11 +99,11 @@ void ListBox::ImplInitListBoxData() mpFloatWin = NULL; mpImplWin = NULL; mpBtn = NULL; - mnDDHeight = 0; - mbDDAutoSize = sal_True; mnSaveValue = LISTBOX_ENTRY_NOTFOUND; mnLineCount = 0; + mbDDAutoSize = true; + mbEdgeBlending = false; } // ----------------------------------------------------------------------- @@ -152,13 +152,13 @@ void ListBox::ImplInit( Window* pParent, mpImplWin->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) ); mpImplWin->Show(); mpImplWin->GetDropTarget()->addDropTargetListener(xDrop); + mpImplWin->SetEdgeBlending(GetEdgeBlending()); mpBtn = new ImplBtn( this, WB_NOLIGHTBORDER | WB_RECTSTYLE ); ImplInitDropDownButton( mpBtn ); mpBtn->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) ); mpBtn->Show(); mpBtn->GetDropTarget()->addDropTargetListener(xDrop); - } Window* pLBParent = this; @@ -175,6 +175,7 @@ void ListBox::ImplInit( Window* pParent, mpImplLB->SetListItemSelectHdl( LINK( this, ListBox, ImplListItemSelectHdl ) ); //-----IAccessibility2 Implementation 2009 mpImplLB->SetPosPixel( Point() ); + mpImplLB->SetEdgeBlending(GetEdgeBlending()); mpImplLB->Show(); mpImplLB->GetDropTarget()->addDropTargetListener(xDrop); @@ -600,15 +601,20 @@ void ListBox::DataChanged( const DataCha // ----------------------------------------------------------------------- -void ListBox::EnableAutoSize( sal_Bool bAuto ) +void ListBox::EnableAutoSize( bool bAuto ) { mbDDAutoSize = bAuto; if ( mpFloatWin ) { if ( bAuto && !mpFloatWin->GetDropDownLineCount() ) - mpFloatWin->SetDropDownLineCount( 5 ); + { + // use GetListBoxMaximumLineCount here; before, was on fixed number of five + AdaptDropDownLineCountToMaximum(); + } else if ( !bAuto ) + { mpFloatWin->SetDropDownLineCount( 0 ); + } } } @@ -638,6 +644,14 @@ void ListBox::SetDropDownLineCount( sal_ // ----------------------------------------------------------------------- +void ListBox::AdaptDropDownLineCountToMaximum() +{ + // adapt to maximum allowed number + SetDropDownLineCount(std::min(GetEntryCount(), GetSettings().GetStyleSettings().GetListBoxMaximumLineCount())); +} + +// ----------------------------------------------------------------------- + sal_uInt16 ListBox::GetDropDownLineCount() const { if ( mpFloatWin ) @@ -1662,6 +1676,37 @@ const Wallpaper& ListBox::GetDisplayBack return mpImplLB->GetDisplayBackground(); } +// ----------------------------------------------------------------------- + +void ListBox::SetEdgeBlending(bool bNew) +{ + if(mbEdgeBlending != bNew) + { + mbEdgeBlending = bNew; + + if(IsDropDownBox()) + { + mpImplWin->Invalidate(); + } + else + { + mpImplLB->Invalidate(); + } + + if(mpImplWin) + { + mpImplWin->SetEdgeBlending(GetEdgeBlending()); + } + + if(mpImplLB) + { + mpImplLB->SetEdgeBlending(GetEdgeBlending()); + } + + Invalidate(); + } +} + // ======================================================================= MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) : ListBox( WINDOW_MULTILISTBOX ) @@ -1684,3 +1729,4 @@ MultiListBox::MultiListBox( Window* pPar Show(); EnableMultiSelection( sal_True ); } +
Modified: openoffice/branches/ia2/main/vcl/source/gdi/metaact.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/gdi/metaact.cxx?rev=1476499&r1=1476498&r2=1476499&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/gdi/metaact.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/gdi/metaact.cxx Sat Apr 27 05:51:13 2013 @@ -4104,20 +4104,34 @@ void MetaCommentAction::Move( long nXMov { SvtGraphicStroke aStroke; aMemStm >> aStroke; - Polygon aPath; + + Polygon aPath; aStroke.getPath( aPath ); aPath.Move( nXMove, nYMove ); aStroke.setPath( aPath ); + + PolyPolygon aStartArrow; + aStroke.getStartArrow(aStartArrow); + aStartArrow.Move(nXMove, nYMove); + aStroke.setStartArrow(aStartArrow); + + PolyPolygon aEndArrow; + aStroke.getEndArrow(aEndArrow); + aEndArrow.Move(nXMove, nYMove); + aStroke.setEndArrow(aEndArrow); + aDest << aStroke; } else { SvtGraphicFill aFill; aMemStm >> aFill; - PolyPolygon aPath; + + PolyPolygon aPath; aFill.getPath( aPath ); aPath.Move( nXMove, nYMove ); aFill.setPath( aPath ); + aDest << aFill; } delete[] mpData; Modified: openoffice/branches/ia2/main/writerfilter/source/dmapper/ConversionHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/writerfilter/source/dmapper/ConversionHelper.cxx?rev=1476499&r1=1476498&r2=1476499&view=diff ============================================================================== --- openoffice/branches/ia2/main/writerfilter/source/dmapper/ConversionHelper.cxx (original) +++ openoffice/branches/ia2/main/writerfilter/source/dmapper/ConversionHelper.cxx Sat Apr 27 05:51:13 2013 @@ -120,7 +120,8 @@ void MakeBorderLine( sal_Int32 nLineThic { static const sal_Int32 aBorderDefColor[] = { - COL_AUTO, COL_BLACK, COL_LIGHTBLUE, COL_LIGHTCYAN, COL_LIGHTGREEN, + static_cast<sal_Int32>(COL_AUTO), + COL_BLACK, COL_LIGHTBLUE, COL_LIGHTCYAN, COL_LIGHTGREEN, COL_LIGHTMAGENTA, COL_LIGHTRED, COL_YELLOW, COL_WHITE, COL_BLUE, COL_CYAN, COL_GREEN, COL_MAGENTA, COL_RED, COL_BROWN, COL_GRAY, COL_LIGHTGRAY
