Modified: openoffice/branches/ia2/main/sw/source/core/undo/untblk.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/undo/untblk.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/core/undo/untblk.cxx (original) +++ openoffice/branches/ia2/main/sw/source/core/undo/untblk.cxx Sat May 18 10:12:43 2013 @@ -248,8 +248,9 @@ void SwUndoInserts::UndoImpl(::sw::UndoR pTxtNode->JoinNext(); } // reset all text attributes in the paragraph! - pTxtNode->RstAttr( SwIndex(pTxtNode, 0), pTxtNode->Len(), - 0, 0, true ); + //i121897, change the hints clearing method from 'RstAttr' to 'ClarSwpHints' as the certain tox mark index hint reason + if( pTxtNode && pTxtNode->GetpSwpHints() ) + pTxtNode->ClearSwpHintsArr( true ); // setze alle Attribute im Node zurueck pTxtNode->ResetAllAttr();
Modified: openoffice/branches/ia2/main/sw/source/filter/html/htmlatr.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/filter/html/htmlatr.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/filter/html/htmlatr.cxx (original) +++ openoffice/branches/ia2/main/sw/source/filter/html/htmlatr.cxx Sat May 18 10:12:43 2013 @@ -3401,7 +3401,9 @@ SwAttrFnTab aHTMLAttrFnTab = { /* RES_CHRATR_OVERLINE */ OutHTML_CSS1Attr, /* RES_CHRATR_DUMMY1 */ 0, /* RES_CHRATR_DUMMY2 */ 0, - +//For i120935, Insert blank entry for RES_CHRATR_BIDITRL and RES_CHRATR_IDCTHINT, for keep the identical res order +/*RES_CHRATR_BIDIRTL*/ 0, +/*RES_CHRATR_IDCTHINT*/ 0, /* RES_TXTATR_REFMARK */ 0, /* RES_TXTATR_TOXMARK */ 0, /* RES_TXTATR_META */ 0, Modified: openoffice/branches/ia2/main/sw/source/ui/app/docsh2.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/docsh2.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/app/docsh2.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/app/docsh2.cxx Sat May 18 10:12:43 2013 @@ -58,7 +58,7 @@ #include <svx/fmshell.hxx> #include <svtools/htmlcfg.hxx> -#include <svx/ofaitem.hxx> +//#include <svx/paletteitem.hxx> #include <SwSmartTagMgr.hxx> #include <sfx2/app.hxx> #include <basic/sbstar.hxx> @@ -1018,9 +1018,10 @@ void SwDocShell::Execute(SfxRequest& rRe break; case SID_GET_COLORTABLE: { - SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE); - XColorList* pTable = pColItem->GetColorTable(); - rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable)); + const SvxColorTableItem* pColItem = static_cast< const SvxColorTableItem* >(GetItem(SID_COLOR_TABLE)); + XColorListSharedPtr aTable = pColItem->GetColorTable(); + + rReq.SetReturnValue(SvxColorTableItem(aTable, SID_GET_COLORTABLE)); } break; case FN_ABSTRACT_STARIMPRESS: Modified: openoffice/branches/ia2/main/sw/source/ui/app/docshdrw.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/docshdrw.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/app/docshdrw.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/app/docshdrw.cxx Sat May 18 10:12:43 2013 @@ -62,11 +62,11 @@ void SwDocShell::InitDraw() if( pDrDoc ) { // Listen, bzw. Tables im ItemSet der DocShell anlegen - PutItem( SvxGradientListItem( pDrDoc->GetGradientList(), SID_GRADIENT_LIST ) ); - PutItem( SvxHatchListItem( pDrDoc->GetHatchList(), SID_HATCH_LIST ) ); - PutItem( SvxBitmapListItem( pDrDoc->GetBitmapList(), SID_BITMAP_LIST ) ); - PutItem( SvxDashListItem( pDrDoc->GetDashList(), SID_DASH_LIST ) ); - PutItem( SvxLineEndListItem( pDrDoc->GetLineEndList(), SID_LINEEND_LIST ) ); + PutItem( SvxGradientListItem( pDrDoc->GetGradientListFromSdrModel(), SID_GRADIENT_LIST ) ); + PutItem( SvxHatchListItem( pDrDoc->GetHatchListFromSdrModel(), SID_HATCH_LIST ) ); + PutItem( SvxBitmapListItem( pDrDoc->GetBitmapListFromSdrModel(), SID_BITMAP_LIST ) ); + PutItem( SvxDashListItem( pDrDoc->GetDashListFromSdrModel(), SID_DASH_LIST ) ); + PutItem( SvxLineEndListItem( pDrDoc->GetLineEndListFromSdrModel(), SID_LINEEND_LIST ) ); Outliner& rOutliner = pDrDoc->GetDrawOutliner(); uno::Reference<linguistic2::XHyphenator> xHyphenator( ::GetHyphenator() ); Modified: openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx Sat May 18 10:12:43 2013 @@ -435,15 +435,6 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxOb // wir als BroadCaster werden auch unser eigener Listener // (fuer DocInfo/FileNamen/....) EndListening( *this ); - SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE); - // wird nur die DocInfo fuer den Explorer gelesen, ist das Item nicht da - if(pColItem) - { - XColorList* pTable = pColItem->GetColorTable(); - // wurde eine neue Table angelegt, muss sie auch geloescht werden. - if((void*)pTable != (void*)(XColorList::GetStdColorList()) ) - delete pTable; - } delete pOLEChildList; } Modified: openoffice/branches/ia2/main/sw/source/ui/config/optpage.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/config/optpage.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/config/optpage.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/config/optpage.cxx Sat May 18 10:12:43 2013 @@ -2133,11 +2133,11 @@ void SwRedlineOptionsTabPage::Reset( con aDeletedColorLB.InsertEntry(sAuthor); aChangedColorLB.InsertEntry(sAuthor); - XColorList* pColorTbl = XColorList::GetStdColorList(); + XColorListSharedPtr aColorTbl = XColorList::GetStdColorList(); sal_uInt16 i; - for( i = 0; i < pColorTbl->Count(); ++i ) + for( i = 0; i < aColorTbl->Count(); ++i ) { - XColorEntry* pEntry = pColorTbl->GetColor( i ); + XColorEntry* pEntry = aColorTbl->GetColor( i ); Color aColor = pEntry->GetColor(); String sName = pEntry->GetName(); Modified: openoffice/branches/ia2/main/sw/source/ui/misc/pggrid.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/misc/pggrid.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/misc/pggrid.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/misc/pggrid.cxx Sat May 18 10:12:43 2013 @@ -143,11 +143,11 @@ SwTextGridPage::SwTextGridPage(Window *p aDisplayCB.SetClickHdl(LINK(this, SwTextGridPage, DisplayGridHdl)); - XColorList* pColorTbl = XColorList::GetStdColorList(); + XColorListSharedPtr aColorTbl = XColorList::GetStdColorList(); aColorLB.InsertAutomaticEntry(); - for( sal_uInt16 i = 0; i < pColorTbl->Count(); ++i ) + for( sal_uInt16 i = 0; i < aColorTbl->Count(); ++i ) { - XColorEntry* pEntry = pColorTbl->GetColor( i ); + XColorEntry* pEntry = aColorTbl->GetColor( i ); Color aColor = pEntry->GetColor(); String sName = pEntry->GetName(); aColorLB.InsertEntry( aColor, sName ); Modified: openoffice/branches/ia2/main/sw/source/ui/shells/basesh.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/shells/basesh.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/shells/basesh.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/shells/basesh.cxx Sat May 18 10:12:43 2013 @@ -112,6 +112,8 @@ #include <comcore.hrc> #include <unomid.h> +#include <svx/galleryitem.hxx> +#include <com/sun/star/gallery/GalleryItemType.hpp> FlyMode SwBaseShell::eFrameMode = FLY_DRAG_END; @@ -730,55 +732,57 @@ void SwBaseShell::Execute(SfxRequest &rR break; case SID_GALLERY_FORMATS: { - const int nSelType = rSh.GetSelectionType(); - if(SFX_ITEM_SET == pArgs->GetItemState( nSlot, sal_True, &pItem)) - { - GalleryExplorer* pGal = 0; - if ( (!rSh.IsSelFrmMode() || nSelType & nsSelectionType::SEL_GRF) && - 0!= (pGal = SVX_GALLERY())&& - 0 != (SGA_FORMAT_GRAPHIC & ((SfxUInt32Item*)pItem)->GetValue())) - { - SwWait aWait( *rView.GetDocShell(), sal_True ); + SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, sal_False ); + if ( !pGalleryItem ) + break; - String aGrfName, aFltName; - const Graphic aGrf( pGal->GetGraphic() ); + const int nSelType = rSh.GetSelectionType(); + sal_Int8 nGalleryItemType( pGalleryItem->GetType() ); - if( pGal->IsLinkage() ) - { - // Verknuepft - aGrfName = pGal->GetURL().GetMainURL(INetURLObject::NO_DECODE); - aFltName = pGal->GetFilterName(); - } + if ( (!rSh.IsSelFrmMode() || nSelType & nsSelectionType::SEL_GRF) && + nGalleryItemType == com::sun::star::gallery::GalleryItemType::GRAPHIC ) + { + SwWait aWait( *rView.GetDocShell(), sal_True ); - if ( nSelType & nsSelectionType::SEL_GRF ) - rSh.ReRead( aGrfName, aFltName, &aGrf ); - else - rSh.Insert( aGrfName, aFltName, aGrf ); + String aGrfName, aFltName; + const Graphic aGrf( pGalleryItem->GetGraphic() ); - GetView().GetEditWin().GrabFocus(); - } - else if(!rSh.IsSelFrmMode() && SGA_FORMAT_SOUND & ((SfxUInt32Item*)pItem)->GetValue()) + if( pGalleryItem->IsLink() ) { - const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); - GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L ); + // Verknuepft + aGrfName = pGalleryItem->GetURL(); + aFltName = pGalleryItem->GetFilterName(); + } + + if ( nSelType & nsSelectionType::SEL_GRF ) + rSh.ReRead( aGrfName, aFltName, &aGrf ); + else + rSh.Insert( aGrfName, aFltName, aGrf ); + + GetView().GetEditWin().GrabFocus(); + } + else if(!rSh.IsSelFrmMode() && + nGalleryItemType == com::sun::star::gallery::GalleryItemType::MEDIA ) + { + const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() ); + GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L ); /* - String sURL( pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); - String sLabel( pGal->GetURL().getBase() ); - String sTarget; // empty string! - - bool bIsHTMLMode = - 0 == ( HTMLMODE_ON & - ::GetHtmlMode( GetView().GetDocShell() ) ); - - // in Writer, we insert a button which plays the - // sound. In Writer/Web, we just insert a (text) link. - if( bIsHTMLMode ) - InsertURLButton( sURL, sTarget, sLabel ); - else - rSh.InsertURL( SwFmtINetFmt( sURL, sTarget ), sLabel ); + String sURL( pGalleryItem->GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); + String sLabel( pGalleryItem->GetURL().getBase() ); + String sTarget; // empty string! + + bool bIsHTMLMode = + 0 == ( HTMLMODE_ON & + ::GetHtmlMode( GetView().GetDocShell() ) ); + + // in Writer, we insert a button which plays the + // sound. In Writer/Web, we just insert a (text) link. + if( bIsHTMLMode ) + InsertURLButton( sURL, sTarget, sLabel ); + else + rSh.InsertURL( SwFmtINetFmt( sURL, sTarget ), sLabel ); */ - } - } + } } break; case FN_PAGE_STYLE_SET_COLS: @@ -2859,14 +2863,22 @@ void SwBaseShell::ExecuteGallery(SfxRequ { case SID_GALLERY_BG_BRUSH: { + if ( !pArgs ) + break; + int nSel = rSh.GetSelectionType(); if ( nSel & nsSelectionType::SEL_DRW_TXT ) break; - sal_uInt8 nPos = (sal_uInt8)((SfxUInt16Item &)pArgs->Get(SID_GALLERY_BG_POS)).GetValue(); + SFX_REQUEST_ARG( rReq, pPos, SfxUInt16Item, SID_GALLERY_BG_POS, sal_False ); + SFX_REQUEST_ARG( rReq, pBrush, SvxBrushItem, SID_GALLERY_BG_BRUSH, sal_False ); + if ( !pPos || !pBrush ) + break; + + sal_uInt8 nPos = pPos->GetValue(); ++nPos; - SvxBrushItem aBrush( (SvxBrushItem&)pArgs->Get(SID_GALLERY_BG_BRUSH)); + SvxBrushItem aBrush( *pBrush ); aBrush.SetWhich( RES_BACKGROUND ); if ( nPos == nParagraphPos ) rSh.SetAttr( aBrush ); Modified: openoffice/branches/ia2/main/sw/source/ui/shells/drawdlg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/shells/drawdlg.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/shells/drawdlg.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/shells/drawdlg.cxx Sat May 18 10:12:43 2013 @@ -106,11 +106,10 @@ void SwDrawShell::ExecDrawDlg(SfxRequest pDoc, pView); DBG_ASSERT(pDlg, "Dialogdiet fail!"); - const SvxColorTableItem* pColorItem = (const SvxColorTableItem*) + // const SvxColorTableItem* pColorItem = (const SvxColorTableItem*) GetView().GetDocShell()->GetItem(SID_COLOR_TABLE); - if(pColorItem->GetColorTable() == XColorList::GetStdColorList()) - pDlg->DontDeleteColorTable(); - if (pDlg->Execute() == RET_OK) + + if (pDlg->Execute() == RET_OK) { pSh->StartAction(); if (bHasMarked) Modified: openoffice/branches/ia2/main/sw/source/ui/shells/drwtxtex.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/shells/drwtxtex.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/shells/drwtxtex.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/shells/drwtxtex.cxx Sat May 18 10:12:43 2013 @@ -140,35 +140,35 @@ using namespace ::com::sun::star; void SwDrawTextShell::Execute( SfxRequest &rReq ) { - SwWrtShell &rSh = GetShell(); - OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); - SfxItemSet aEditAttr(pOLV->GetAttribs()); - SfxItemSet aNewAttr(*aEditAttr.GetPool(), aEditAttr.GetRanges()); + SwWrtShell &rSh = GetShell(); + OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); + SfxItemSet aEditAttr(pOLV->GetAttribs()); + SfxItemSet aNewAttr(*aEditAttr.GetPool(), aEditAttr.GetRanges()); - sal_uInt16 nSlot = rReq.GetSlot(); + const sal_uInt16 nSlot = rReq.GetSlot(); - sal_uInt16 nWhich = GetPool().GetWhich(nSlot); - const SfxItemSet *pNewAttrs = rReq.GetArgs(); + const sal_uInt16 nWhich = GetPool().GetWhich(nSlot); + const SfxItemSet *pNewAttrs = rReq.GetArgs(); - bool bRestoreSelection = false; - ESelection aOldSelection; + bool bRestoreSelection = false; + ESelection aOldSelection; - sal_uInt16 nEEWhich = 0; - switch (nSlot) - { - case SID_LANGUAGE_STATUS: + sal_uInt16 nEEWhich = 0; + switch (nSlot) + { + case SID_LANGUAGE_STATUS: { - aOldSelection = pOLV->GetSelection(); - if (!pOLV->GetEditView().HasSelection()) - { - bRestoreSelection = true; - pOLV->GetEditView().SelectCurrentWord(); - } + aOldSelection = pOLV->GetSelection(); + if (!pOLV->GetEditView().HasSelection()) + { + bRestoreSelection = true; + pOLV->GetEditView().SelectCurrentWord(); + } - bRestoreSelection = SwLangHelper::SetLanguageStatus(pOLV,rReq,GetView(),rSh); - break; + bRestoreSelection = SwLangHelper::SetLanguageStatus(pOLV,rReq,GetView(),rSh); + break; } - + case SID_THES: { String aReplaceText; @@ -178,8 +178,8 @@ void SwDrawTextShell::Execute( SfxReques if (aReplaceText.Len() > 0) ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText ); break; - } - + } + case SID_ATTR_CHAR_FONT: case SID_ATTR_CHAR_FONTHEIGHT: case SID_ATTR_CHAR_WEIGHT: @@ -202,12 +202,20 @@ void SwDrawTextShell::Execute( SfxReques case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; - case SID_ATTR_CHAR_UNDERLINE: - { - FontUnderline eFU = ((const SvxUnderlineItem&)aEditAttr.Get(EE_CHAR_UNDERLINE)).GetLineStyle(); - aNewAttr.Put(SvxUnderlineItem(eFU == UNDERLINE_SINGLE ? UNDERLINE_NONE : UNDERLINE_SINGLE, EE_CHAR_UNDERLINE)); - } - break; + case SID_ATTR_CHAR_UNDERLINE: + { + if ( pNewAttrs ) + { + const SvxTextLineItem& rTextLineItem = static_cast< const SvxTextLineItem& >( pNewAttrs->Get( pNewAttrs->GetPool()->GetWhich(nSlot) ) ); + aNewAttr.Put( SvxUnderlineItem( rTextLineItem.GetLineStyle(), EE_CHAR_UNDERLINE ) ); + } + else + { + FontUnderline eFU = ((const SvxUnderlineItem&)aEditAttr.Get(EE_CHAR_UNDERLINE)).GetLineStyle(); + aNewAttr.Put( SvxUnderlineItem(eFU == UNDERLINE_SINGLE ? UNDERLINE_NONE : UNDERLINE_SINGLE, EE_CHAR_UNDERLINE) ); + } + } + break; case SID_ATTR_CHAR_OVERLINE: { @@ -707,7 +715,6 @@ ASK_ADJUST: } else rSet.InvalidateItem(nSlotId); - Invalidate(SID_ATTR_PARA_ULSPACE); nSlotId = 0; } break; Modified: openoffice/branches/ia2/main/sw/source/ui/shells/drwtxtsh.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/shells/drwtxtsh.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/shells/drwtxtsh.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/shells/drwtxtsh.cxx Sat May 18 10:12:43 2013 @@ -168,19 +168,7 @@ SwDrawTextShell::SwDrawTextShell(SwView __EXPORT SwDrawTextShell::~SwDrawTextShell() { if ( GetView().GetCurShell() == this ) - rView.ResetSubShell(); - - //MA 13. Nov. 96: Das kommt durchaus vor #33141#: - //(doppel-)Klick von einem Texteditmode in ein anderes Objekt, zwischendurch - //wird eine andere (Draw-)Shell gepusht, die alte aber noch nicht deletet. - //Dann wird vor dem Flush wieder ein DrawTextShell gepusht und der Mode ist - //eingeschaltet. In diesem Moment wird der Dispatcher geflusht und die alte - //DrawTextShell zerstoert. -// ASSERT( !pSdrView->IsTextEdit(), "TextEdit in DTor DrwTxtSh?" ); -// if (pSdrView->IsTextEdit()) -// GetShell().EndTextEdit(); // Danebengeklickt, Ende mit Edit - -// GetShell().Edit(); + rView.ResetSubShell(); } SwWrtShell& SwDrawTextShell::GetShell() @@ -536,19 +524,18 @@ void SwDrawTextShell::ExecDraw(SfxReques } break; - case FN_ESCAPE: - if (pSdrView->IsTextEdit()) - { - // Shellwechsel! - rSh.EndTextEdit(); + case FN_ESCAPE: + if (pSdrView->IsTextEdit()) + { + // Shellwechsel! + rSh.EndTextEdit(); SwView& rTempView = rSh.GetView(); rTempView.ExitDraw(); - rSh.Edit(); - rTempView.AttrChangedNotify(&rSh); - return; - } - break; - case FN_DRAWTEXT_ATTR_DLG: + rSh.Edit(); + return; + } + break; + case FN_DRAWTEXT_ATTR_DLG: { SfxItemSet aNewAttr( pSdrView->GetModel()->GetItemPool() ); pSdrView->GetAttributes( aNewAttr ); Modified: openoffice/branches/ia2/main/sw/source/ui/shells/slotadd.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/shells/slotadd.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/shells/slotadd.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/shells/slotadd.cxx Sat May 18 10:12:43 2013 @@ -141,6 +141,7 @@ #include <svx/xlncapit.hxx> #include <svx/xlinjoit.hxx> #include <svx/AffineMatrixItem.hxx> +#include <svx/galleryitem.hxx> #define SFX_TYPEMAP #include <sfx2/msg.hxx> Modified: openoffice/branches/ia2/main/sw/source/ui/sidebar/PagePropertyPanel.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/sidebar/PagePropertyPanel.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/sidebar/PagePropertyPanel.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/sidebar/PagePropertyPanel.cxx Sat May 18 10:12:43 2013 @@ -68,7 +68,7 @@ namespace { const cssu::Reference< css::frame::XModel >& xModel = xController->getModel(); if ( xModel.is() ) { - const cssu::Reference< css::document::XUndoManagerSupplier > xSuppUndo( xModel, cssu::UNO_QUERY_THROW ); + const cssu::Reference< css::document::XUndoManagerSupplier > xSuppUndo( xModel, cssu::UNO_QUERY_THROW ); if ( xSuppUndo.is() ) { const cssu::Reference< css::document::XUndoManager > xUndoManager( xSuppUndo->getUndoManager(), cssu::UNO_QUERY_THROW ); Modified: openoffice/branches/ia2/main/sw/source/ui/sidebar/PagePropertyPanel.src URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/sidebar/PagePropertyPanel.src?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/sidebar/PagePropertyPanel.src (original) +++ openoffice/branches/ia2/main/sw/source/ui/sidebar/PagePropertyPanel.src Sat May 18 10:12:43 2013 @@ -19,7 +19,7 @@ * *************************************************************/ -#include <sfx2/sidebar/propertypanel.hrc> +#include <sfx2/sidebar/ResourceDefinitions.hrc> #include "PropertyPanel.hrc" #include "PagePropertyPanel.hrc" #include "helpid.h" Modified: openoffice/branches/ia2/main/sw/source/ui/sidebar/PageSizeControl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/sidebar/PageSizeControl.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/sidebar/PageSizeControl.cxx (original) +++ openoffice/branches/ia2/main/sw/source/ui/sidebar/PageSizeControl.cxx Sat May 18 10:12:43 2013 @@ -116,9 +116,9 @@ PageSizeControl::PageSizeControl( maWidthHeightField.IsUseThousandSep(), maWidthHeightField.IsShowTrailingZeros() ); - ItemText2 = HeightStr; + ItemText2 = WidthStr; ItemText2 += String::CreateFromAscii(" x "); - ItemText2 += WidthStr; + ItemText2 += HeightStr; ItemText2 += String::CreateFromAscii(" "); ItemText2 += aMetricStr; Modified: openoffice/branches/ia2/main/sw/source/ui/sidebar/WrapPropertyPanel.src URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/sidebar/WrapPropertyPanel.src?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/source/ui/sidebar/WrapPropertyPanel.src (original) +++ openoffice/branches/ia2/main/sw/source/ui/sidebar/WrapPropertyPanel.src Sat May 18 10:12:43 2013 @@ -19,7 +19,7 @@ * *************************************************************/ -#include <sfx2/sidebar/propertypanel.hrc> +#include <sfx2/sidebar/ResourceDefinitions.hrc> #include "PropertyPanel.hrc" #include "WrapPropertyPanel.hrc" #include "helpid.h" Modified: openoffice/branches/ia2/main/sw/uiconfig/sglobal/menubar/menubar.xml URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/uiconfig/sglobal/menubar/menubar.xml?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/uiconfig/sglobal/menubar/menubar.xml (original) +++ openoffice/branches/ia2/main/sw/uiconfig/sglobal/menubar/menubar.xml Sat May 18 10:12:43 2013 @@ -141,6 +141,7 @@ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/> <menu:menuitem menu:id=".uno:Navigator"/> <menu:menuitem menu:id=".uno:TaskPane"/> + <menu:menuitem menu:id=".uno:Sidebar"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:FullScreen"/> <menu:menuitem menu:id=".uno:Zoom"/> Modified: openoffice/branches/ia2/main/sw/uiconfig/sweb/menubar/menubar.xml URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/uiconfig/sweb/menubar/menubar.xml?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/uiconfig/sweb/menubar/menubar.xml (original) +++ openoffice/branches/ia2/main/sw/uiconfig/sweb/menubar/menubar.xml Sat May 18 10:12:43 2013 @@ -114,6 +114,7 @@ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/> <menu:menuitem menu:id=".uno:Navigator"/> <menu:menuitem menu:id=".uno:TaskPane"/> + <menu:menuitem menu:id=".uno:Sidebar"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:FullScreen"/> <menu:menuitem menu:id=".uno:Zoom"/> Modified: openoffice/branches/ia2/main/sw/uiconfig/swform/menubar/menubar.xml URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/uiconfig/swform/menubar/menubar.xml?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/uiconfig/swform/menubar/menubar.xml (original) +++ openoffice/branches/ia2/main/sw/uiconfig/swform/menubar/menubar.xml Sat May 18 10:12:43 2013 @@ -141,6 +141,7 @@ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/> <menu:menuitem menu:id=".uno:Navigator"/> <menu:menuitem menu:id=".uno:TaskPane"/> + <menu:menuitem menu:id=".uno:Sidebar"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:FullScreen"/> <menu:menuitem menu:id=".uno:Zoom"/> Modified: openoffice/branches/ia2/main/sw/uiconfig/swreport/menubar/menubar.xml URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/uiconfig/swreport/menubar/menubar.xml?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/uiconfig/swreport/menubar/menubar.xml (original) +++ openoffice/branches/ia2/main/sw/uiconfig/swreport/menubar/menubar.xml Sat May 18 10:12:43 2013 @@ -141,6 +141,7 @@ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/> <menu:menuitem menu:id=".uno:Navigator"/> <menu:menuitem menu:id=".uno:TaskPane"/> + <menu:menuitem menu:id=".uno:Sidebar"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:FullScreen"/> <menu:menuitem menu:id=".uno:Zoom"/> Modified: openoffice/branches/ia2/main/sw/uiconfig/swxform/menubar/menubar.xml URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/uiconfig/swxform/menubar/menubar.xml?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/sw/uiconfig/swxform/menubar/menubar.xml (original) +++ openoffice/branches/ia2/main/sw/uiconfig/swxform/menubar/menubar.xml Sat May 18 10:12:43 2013 @@ -142,6 +142,7 @@ <menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/> <menu:menuitem menu:id=".uno:Navigator"/> <menu:menuitem menu:id=".uno:TaskPane"/> + <menu:menuitem menu:id=".uno:Sidebar"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:FullScreen"/> <menu:menuitem menu:id=".uno:Zoom"/> Modified: openoffice/branches/ia2/main/vcl/inc/graphite_cache.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/graphite_cache.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/inc/graphite_cache.hxx (original) +++ openoffice/branches/ia2/main/vcl/inc/graphite_cache.hxx Sat May 18 10:12:43 2013 @@ -32,7 +32,6 @@ #define GRCACHE_REUSE_VECTORS 1 -//#include <rope> #include <hash_map> class TextSourceAdaptor; Modified: openoffice/branches/ia2/main/vcl/inc/vcl/outdev.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/outdev.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/inc/vcl/outdev.hxx (original) +++ openoffice/branches/ia2/main/vcl/inc/vcl/outdev.hxx Sat May 18 10:12:43 2013 @@ -562,6 +562,7 @@ public: SAL_DLLPRIVATE bool ImpTryDrawPolyLineDirect( const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth = 0.0, + double fTransparency = 0.0, basegfx::B2DLineJoin eLineJoin = basegfx::B2DLINEJOIN_NONE, com::sun::star::drawing::LineCap eLineCap = com::sun::star::drawing::LineCap_BUTT); @@ -699,6 +700,12 @@ public: double fLineWidth = 0.0, basegfx::B2DLineJoin = basegfx::B2DLINEJOIN_ROUND, com::sun::star::drawing::LineCap = com::sun::star::drawing::LineCap_BUTT); + bool TryDrawPolyLineDirect( + const basegfx::B2DPolygon& rB2DPolygon, + double fLineWidth = 0.0, + double fTransparency = 0.0, + basegfx::B2DLineJoin eLineJoin = basegfx::B2DLINEJOIN_NONE, + com::sun::star::drawing::LineCap eLineCap = com::sun::star::drawing::LineCap_BUTT); /** Render the given polygon as a line stroke @@ -1086,6 +1093,10 @@ public: const MapMode& rMapModeSource, const MapMode& rMapModeDest ); + // create a mapping transformation from rMapModeSource to rMapModeDest (the above methods + // for B2DPoly/Polygons use this internally anyways to transform the B2DPolygon) + static basegfx::B2DHomMatrix LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest); + Size GetOutputSizePixel() const { return Size( mnOutWidth, mnOutHeight ); } long GetOutputWidthPixel() const { return mnOutWidth; } Modified: openoffice/branches/ia2/main/vcl/inc/vcl/settings.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/settings.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/inc/vcl/settings.hxx (original) +++ openoffice/branches/ia2/main/vcl/inc/vcl/settings.hxx Sat May 18 10:12:43 2013 @@ -440,6 +440,7 @@ private: Size maListBoxPreviewDefaultLogicSize; Size maListBoxPreviewDefaultPixelSize; sal_uInt16 mnListBoxPreviewDefaultLineWidth; + sal_Bool mbPreviewUsesCheckeredBackground; }; #define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 ) @@ -969,6 +970,11 @@ public: void SetListBoxPreviewDefaultLineWidth(sal_uInt16 nWidth) { CopyData(); mpData->mnListBoxPreviewDefaultLineWidth = nWidth; } sal_uInt16 GetListBoxPreviewDefaultLineWidth() const { return mpData->mnListBoxPreviewDefaultLineWidth; } + // defines if previews which containn potentially transparent objects (e.g. the dash/line/LineStartEnd previews and others) + // use the default transparent visualization background (checkered background) as it has got standard in graphic programs nowadays + void SetPreviewUsesCheckeredBackground(bool bNew) { CopyData(); mpData->mbPreviewUsesCheckeredBackground = bNew; } + bool GetPreviewUsesCheckeredBackground() const { return mpData->mbPreviewUsesCheckeredBackground; } + void SetStandardStyles(); const StyleSettings& operator =( const StyleSettings& rSet ); Modified: openoffice/branches/ia2/main/vcl/source/app/settings.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/app/settings.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/app/settings.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/app/settings.cxx Sat May 18 10:12:43 2013 @@ -441,6 +441,7 @@ ImplStyleData::ImplStyleData() maListBoxPreviewDefaultLogicSize = Size(15, 7); maListBoxPreviewDefaultPixelSize = Size(0, 0); // on-demand calculated in GetListBoxPreviewDefaultPixelSize() mnListBoxPreviewDefaultLineWidth = 1; + mbPreviewUsesCheckeredBackground = true; SetStandardStyles(); } @@ -553,6 +554,7 @@ ImplStyleData::ImplStyleData( const Impl maListBoxPreviewDefaultLogicSize = rData.maListBoxPreviewDefaultLogicSize; maListBoxPreviewDefaultPixelSize = rData.maListBoxPreviewDefaultPixelSize; mnListBoxPreviewDefaultLineWidth = rData.mnListBoxPreviewDefaultLineWidth; + mbPreviewUsesCheckeredBackground = rData.mbPreviewUsesCheckeredBackground; } // ----------------------------------------------------------------------- @@ -1072,7 +1074,8 @@ sal_Bool StyleSettings::operator ==( con (mpData->mnColorValueSetMaximumRowCount == rSet.mpData->mnColorValueSetMaximumRowCount) && (mpData->maListBoxPreviewDefaultLogicSize == rSet.mpData->maListBoxPreviewDefaultLogicSize) && (mpData->maListBoxPreviewDefaultPixelSize == rSet.mpData->maListBoxPreviewDefaultPixelSize) && - (mpData->mnListBoxPreviewDefaultLineWidth == rSet.mpData->mnListBoxPreviewDefaultLineWidth)) + (mpData->mnListBoxPreviewDefaultLineWidth == rSet.mpData->mnListBoxPreviewDefaultLineWidth) && + (mpData->mbPreviewUsesCheckeredBackground == rSet.mpData->mbPreviewUsesCheckeredBackground)) return sal_True; else return sal_False; Modified: openoffice/branches/ia2/main/vcl/source/gdi/outdev.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/gdi/outdev.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/gdi/outdev.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/gdi/outdev.cxx Sat May 18 10:12:43 2013 @@ -105,6 +105,7 @@ struct ImplObjStack { ImplObjStack* mpPrev; MapMode* mpMapMode; + bool mbMapActive; Region* mpClipRegion; Color* mpLineColor; Color* mpFillColor; @@ -2259,6 +2260,7 @@ void OutputDevice::ImpDrawPolyPolygonWit bool OutputDevice::ImpTryDrawPolyLineDirect( const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth, + double fTransparency, basegfx::B2DLineJoin eLineJoin, com::sun::star::drawing::LineCap eLineCap) { @@ -2288,13 +2290,64 @@ bool OutputDevice::ImpTryDrawPolyLineDir // draw the polyline return mpGraphics->DrawPolyLine( aB2DPolygon, - 0.0, + fTransparency, aB2DLineWidth, eLineJoin, eLineCap, this); } +bool OutputDevice::TryDrawPolyLineDirect( + const basegfx::B2DPolygon& rB2DPolygon, + double fLineWidth, + double fTransparency, + basegfx::B2DLineJoin eLineJoin, + com::sun::star::drawing::LineCap eLineCap) +{ + // AW: Do NOT paint empty PolyPolygons + if(!rB2DPolygon.count()) + return true; + + // we need a graphics + if( !mpGraphics ) + if( !ImplGetGraphics() ) + return false; + + if( mbInitClipRegion ) + ImplInitClipRegion(); + + if( mbOutputClipped ) + return true; + + if( mbInitLineColor ) + ImplInitLineColor(); + + const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) + && mpGraphics->supportsOperation(OutDevSupport_B2DDraw) + && ROP_OVERPAINT == GetRasterOp() + && IsLineColor()); + + if(bTryAA) + { + if(ImpTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, fTransparency, eLineJoin, eLineCap)) + { + // worked, add metafile action (if recorded) and return true + if( mpMetaFile ) + { + LineInfo aLineInfo; + if( fLineWidth != 0.0 ) + aLineInfo.SetWidth( static_cast<long>(fLineWidth+0.5) ); + const Polygon aToolsPolygon( rB2DPolygon ); + mpMetaFile->AddAction( new MetaPolyLineAction( aToolsPolygon, aLineInfo ) ); + } + + return true; + } + } + + return false; +} + void OutputDevice::DrawPolyLine( const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth, @@ -2303,8 +2356,6 @@ void OutputDevice::DrawPolyLine( { DBG_TRACE( "OutputDevice::DrawPolyLine(B2D&)" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); - (void)eLineJoin; // ATM used in UNX, but not in WNT, access it for warning-free - (void)eLineCap; #if 0 // MetaB2DPolyLineAction is not implemented yet: // according to AW adding it is very dangerous since there is a lot @@ -2346,7 +2397,7 @@ void OutputDevice::DrawPolyLine( && IsLineColor()); // use b2dpolygon drawing if possible - if(bTryAA && ImpTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, eLineJoin, eLineCap)) + if(bTryAA && ImpTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, 0.0, eLineJoin, eLineCap)) { return; } @@ -2486,10 +2537,8 @@ void OutputDevice::Push( sal_uInt16 nFla pData->meRasterOp = GetRasterOp(); if ( nFlags & PUSH_MAPMODE ) { - if ( mbMap ) - pData->mpMapMode = new MapMode( maMapMode ); - else - pData->mpMapMode = NULL; + pData->mpMapMode = new MapMode( maMapMode ); + pData->mbMapActive = mbMap; } if ( nFlags & PUSH_CLIPREGION ) { @@ -2588,6 +2637,7 @@ void OutputDevice::Pop() SetMapMode( *pData->mpMapMode ); else SetMapMode(); + mbMap = pData->mbMapActive; } if ( pData->mnFlags & PUSH_CLIPREGION ) ImplSetClipRegion( pData->mpClipRegion ); Modified: openoffice/branches/ia2/main/vcl/source/gdi/outdev6.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/gdi/outdev6.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/gdi/outdev6.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/gdi/outdev6.cxx Sat May 18 10:12:43 2013 @@ -1255,7 +1255,7 @@ void OutputDevice::DrawCheckered(const P const sal_uInt32 nMaxX(rPos.X() + rSize.Width()); const sal_uInt32 nMaxY(rPos.Y() + rSize.Height()); - Push(); + Push(PUSH_LINECOLOR|PUSH_FILLCOLOR); SetLineColor(); for(sal_uInt32 x(0), nX(rPos.X()); nX < nMaxX; x++, nX += nLen) Modified: openoffice/branches/ia2/main/vcl/source/gdi/outmap.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/gdi/outmap.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/gdi/outmap.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/gdi/outmap.cxx Sat May 18 10:12:43 2013 @@ -2322,43 +2322,16 @@ basegfx::B2DPolygon OutputDevice::LogicT const MapMode& rMapModeSource, const MapMode& rMapModeDest ) { - if ( rMapModeSource == rMapModeDest ) - return rPolySource; - - MapUnit eUnitSource = rMapModeSource.GetMapUnit(); - MapUnit eUnitDest = rMapModeDest.GetMapUnit(); - ENTER2( eUnitSource, eUnitDest ); - - basegfx::B2DHomMatrix aTransform; - - if ( rMapModeSource.mpImplMapMode->mbSimple && - rMapModeDest.mpImplMapMode->mbSimple ) - { - ENTER3( eUnitSource, eUnitDest ); + if(rMapModeSource == rMapModeDest) + { + return rPolySource; + } - const double fScaleFactor((double)nNumerator / (double)nDenominator); - aTransform.set(0, 0, fScaleFactor); - aTransform.set(1, 1, fScaleFactor); - } - else - { - ENTER4( rMapModeSource, rMapModeDest ); + const basegfx::B2DHomMatrix aTransform(LogicToLogic(rMapModeSource, rMapModeDest)); + basegfx::B2DPolygon aPoly(rPolySource); - const double fScaleFactorX( (double(aMapResSource.mnMapScNumX) * double(aMapResDest.mnMapScDenomX)) - / (double(aMapResSource.mnMapScDenomX) * double(aMapResDest.mnMapScNumX)) ); - const double fScaleFactorY( (double(aMapResSource.mnMapScNumY) * double(aMapResDest.mnMapScDenomY)) - / (double(aMapResSource.mnMapScDenomY) * double(aMapResDest.mnMapScNumY)) ); - const double fZeroPointX(double(aMapResSource.mnMapOfsX) * fScaleFactorX - double(aMapResDest.mnMapOfsX)); - const double fZeroPointY(double(aMapResSource.mnMapOfsY) * fScaleFactorY - double(aMapResDest.mnMapOfsY)); - - aTransform.set(0, 0, fScaleFactorX); - aTransform.set(1, 1, fScaleFactorY); - aTransform.set(0, 2, fZeroPointX); - aTransform.set(1, 2, fZeroPointY); - } - basegfx::B2DPolygon aPoly( rPolySource ); - aPoly.transform( aTransform ); - return aPoly; + aPoly.transform(aTransform); + return aPoly; } // ----------------------------------------------------------------------- @@ -2367,43 +2340,57 @@ basegfx::B2DPolyPolygon OutputDevice::Lo const MapMode& rMapModeSource, const MapMode& rMapModeDest ) { - if ( rMapModeSource == rMapModeDest ) - return rPolySource; + if(rMapModeSource == rMapModeDest) + { + return rPolySource; + } - MapUnit eUnitSource = rMapModeSource.GetMapUnit(); - MapUnit eUnitDest = rMapModeDest.GetMapUnit(); - ENTER2( eUnitSource, eUnitDest ); + const basegfx::B2DHomMatrix aTransform(LogicToLogic(rMapModeSource, rMapModeDest)); + basegfx::B2DPolyPolygon aPoly(rPolySource); - basegfx::B2DHomMatrix aTransform; + aPoly.transform(aTransform); + return aPoly; +} - if ( rMapModeSource.mpImplMapMode->mbSimple && - rMapModeDest.mpImplMapMode->mbSimple ) - { - ENTER3( eUnitSource, eUnitDest ); +// ----------------------------------------------------------------------- - const double fScaleFactor((double)nNumerator / (double)nDenominator); - aTransform.set(0, 0, fScaleFactor); - aTransform.set(1, 1, fScaleFactor); - } - else - { - ENTER4( rMapModeSource, rMapModeDest ); +basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest) +{ + basegfx::B2DHomMatrix aTransform; - const double fScaleFactorX( (double(aMapResSource.mnMapScNumX) * double(aMapResDest.mnMapScDenomX)) - / (double(aMapResSource.mnMapScDenomX) * double(aMapResDest.mnMapScNumX)) ); - const double fScaleFactorY( (double(aMapResSource.mnMapScNumY) * double(aMapResDest.mnMapScDenomY)) - / (double(aMapResSource.mnMapScDenomY) * double(aMapResDest.mnMapScNumY)) ); - const double fZeroPointX(double(aMapResSource.mnMapOfsX) * fScaleFactorX - double(aMapResDest.mnMapOfsX)); - const double fZeroPointY(double(aMapResSource.mnMapOfsY) * fScaleFactorY - double(aMapResDest.mnMapOfsY)); - - aTransform.set(0, 0, fScaleFactorX); - aTransform.set(1, 1, fScaleFactorY); - aTransform.set(0, 2, fZeroPointX); - aTransform.set(1, 2, fZeroPointY); - } - basegfx::B2DPolyPolygon aPoly( rPolySource ); - aPoly.transform( aTransform ); - return aPoly; + if(rMapModeSource == rMapModeDest) + { + return aTransform; + } + + MapUnit eUnitSource = rMapModeSource.GetMapUnit(); + MapUnit eUnitDest = rMapModeDest.GetMapUnit(); + ENTER2(eUnitSource, eUnitDest); + + if(rMapModeSource.mpImplMapMode->mbSimple && rMapModeDest.mpImplMapMode->mbSimple) + { + ENTER3(eUnitSource, eUnitDest); + + const double fScaleFactor((double)nNumerator / (double)nDenominator); + aTransform.set(0, 0, fScaleFactor); + aTransform.set(1, 1, fScaleFactor); + } + else + { + ENTER4(rMapModeSource, rMapModeDest); + + const double fScaleFactorX((double(aMapResSource.mnMapScNumX) * double(aMapResDest.mnMapScDenomX)) / (double(aMapResSource.mnMapScDenomX) * double(aMapResDest.mnMapScNumX))); + const double fScaleFactorY((double(aMapResSource.mnMapScNumY) * double(aMapResDest.mnMapScDenomY)) / (double(aMapResSource.mnMapScDenomY) * double(aMapResDest.mnMapScNumY))); + const double fZeroPointX(double(aMapResSource.mnMapOfsX) * fScaleFactorX - double(aMapResDest.mnMapOfsX)); + const double fZeroPointY(double(aMapResSource.mnMapOfsY) * fScaleFactorY - double(aMapResDest.mnMapOfsY)); + + aTransform.set(0, 0, fScaleFactorX); + aTransform.set(1, 1, fScaleFactorY); + aTransform.set(0, 2, fZeroPointX); + aTransform.set(1, 2, fZeroPointY); + } + + return aTransform; } // ----------------------------------------------------------------------- Modified: openoffice/branches/ia2/main/vcl/source/glyphs/gcach_ftyp.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/glyphs/gcach_ftyp.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/glyphs/gcach_ftyp.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/glyphs/gcach_ftyp.cxx Sat May 18 10:12:43 2013 @@ -131,8 +131,7 @@ FT_Error (*pFTEmbolden)(FT_GlyphSlot); FT_Error (*pFTOblique)(FT_GlyphSlot); static bool bEnableSizeFT = false; -struct EqStr{ bool operator()(const char* a, const char* b) const { return !strcmp(a,b); } }; -typedef ::std::hash_map<const char*,FtFontFile*,::std::hash<const char*>, EqStr> FontFileList; +typedef ::std::hash_map< const char*, FtFontFile*, rtl::CStringHash, rtl::CStringEqual> FontFileList; namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } // ----------------------------------------------------------------------- Modified: openoffice/branches/ia2/main/vcl/source/window/dockwin.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/window/dockwin.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/window/dockwin.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/window/dockwin.cxx Sat May 18 10:12:43 2013 @@ -762,10 +762,19 @@ void DockingWindow::Resizing( Size& ) void DockingWindow::StateChanged( StateChangedType nType ) { - if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) + switch(nType) { - ImplInitSettings(); - Invalidate(); + case STATE_CHANGE_CONTROLBACKGROUND: + ImplInitSettings(); + Invalidate(); + break; + + case STATE_CHANGE_STYLE: + mbDockable = (GetStyle() & WB_DOCKABLE) != 0; + break; + + default: + break; } Window::StateChanged( nType ); Modified: openoffice/branches/ia2/main/writerfilter/source/resourcemodel/TagLogger.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/writerfilter/source/resourcemodel/TagLogger.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/writerfilter/source/resourcemodel/TagLogger.cxx (original) +++ openoffice/branches/ia2/main/writerfilter/source/resourcemodel/TagLogger.cxx Sat May 18 10:12:43 2013 @@ -224,15 +224,7 @@ ostream & XMLTag::output(ostream & o, co return o; } -struct eqstr -{ - bool operator()(const char* s1, const char* s2) const - { - return strcmp(s1, s2) == 0; - } -}; - -typedef hash_map<const char *, TagLogger::Pointer_t, hash<const char *>, eqstr> TagLoggerHashMap_t; +typedef hash_map< const char*, TagLogger::Pointer_t, rtl::CStringHash, rtl::CStringEqual> TagLoggerHashMap_t; static TagLoggerHashMap_t * tagLoggers = NULL; TagLogger::TagLogger() Modified: openoffice/branches/ia2/main/xml2cmp/source/x2cclass/x2cstl.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xml2cmp/source/x2cclass/x2cstl.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/xml2cmp/source/x2cclass/x2cstl.hxx (original) +++ openoffice/branches/ia2/main/xml2cmp/source/x2cclass/x2cstl.hxx Sat May 18 10:12:43 2013 @@ -24,14 +24,7 @@ #ifndef UDKSERVICE_X2CSTL_HXX #define UDKSERVICE_X2CSTL_HXX - -#if STLPORT_VERSION < 321 -#include <tools/presys.h> -#include <vector.h> -#include <tools/postsys.h> -#else #include <vector> -#endif // STLPORT_VERSION < 321 #ifdef _USE_NO_NAMERSPACES_ #define std Modified: openoffice/branches/ia2/main/xmloff/source/draw/EnhancedCustomShapeToken.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmloff/source/draw/EnhancedCustomShapeToken.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff ============================================================================== --- openoffice/branches/ia2/main/xmloff/source/draw/EnhancedCustomShapeToken.cxx (original) +++ openoffice/branches/ia2/main/xmloff/source/draw/EnhancedCustomShapeToken.cxx Sat May 18 10:12:43 2013 @@ -26,18 +26,11 @@ #include "EnhancedCustomShapeToken.hxx" #include <osl/mutex.hxx> #include <hash_map> -#include <string.h> +#include <rtl/string.hxx> namespace xmloff { namespace EnhancedCustomShapeToken { -struct TCheck -{ - bool operator()( const char* s1, const char* s2 ) const - { - return strcmp( s1, s2 ) == 0; - } -}; -typedef std::hash_map< const char*, EnhancedCustomShapeTokenEnum, std::hash<const char*>, TCheck> TypeNameHashMap; +typedef std::hash_map< const char*, EnhancedCustomShapeTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() {
