[PATCH] fdo#55582 calc part
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3872 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/3872/1 fdo#55582 calc part Since the actual Patch for fdo#55582 hangs on the writer part, I commit that bloody sc part NOW, to appear as early as in 4.1. Change-Id: I01ce4a7a7738304f47efc718c382a5b1dee68ea2 Signed-off-by: Lennard Wasserthal --- M sc/sdi/drawsh.sdi M sc/source/ui/drawfunc/drawsh5.cxx 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index 6c9ec0b..ff8cd35 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -142,6 +142,7 @@ SID_DELETE_CONTENTS [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_CUT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_COPY[ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] +SID_PASTE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_SELECTALL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_OBJECT_ROTATE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] SID_OBJECT_MIRROR [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 153ea16..8a82fda 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -357,7 +358,7 @@ break; case SID_PASTE: -OSL_FAIL( "SdrView::PasteClipboard not supported anymore" ); +ScClipUtil::PasteFromClipboard ( GetViewData(), GetViewData()->GetViewShell(), true ); break; case SID_SELECTALL: -- To view, visit https://gerrit.libreoffice.org/3872 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01ce4a7a7738304f47efc718c382a5b1dee68ea2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Added further documentation for sfx2
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3871 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/3871/1 Added further documentation for sfx2 Added further documentation on the sfx2 framework. Turned the packed odg file into a git-friendly html+svg file. Change-Id: I0b86f00ffb9355d4cbc911a7b406b1b76dbf62ac Signed-off-by: Lennard Wasserthal --- M sfx2/README A sfx2/doc/sfx2doc.html D sfx2/doc/sfx2doc.odg A sfx2/doc/sfx2doc0001.svg 4 files changed, 180 insertions(+), 1 deletion(-) diff --git a/sfx2/README b/sfx2/README index 1434834..508d979 100644 --- a/sfx2/README +++ b/sfx2/README @@ -1,5 +1,7 @@ SFX is the "old" framework, used for historical reasons. +An attempt of documentation of this module is located in [git:sfx2/doc]. + It contains base classes for document model, view and controller, used by "old" applications like sw, sc, sd (while "new" applications are based on the "new" UNO based framework in "framework"). @@ -12,7 +14,7 @@ Document load/save code is maintained in [git:sfx2/source/doc/docfile.cxx] SfxMedium class, which handles all the twisty load and save corner cases. -[git:sfx2/source/applappl/sfxhelp.cxx] Start procedure for the online +[git:sfx2/source/appl/sfxhelp.cxx] Start procedure for the online help viewer top level window; handling of help URL creation and dispatch. diff --git a/sfx2/doc/sfx2doc.html b/sfx2/doc/sfx2doc.html new file mode 100644 index 000..4ac9f29 --- /dev/null +++ b/sfx2/doc/sfx2doc.html @@ -0,0 +1,78 @@ + + + +Signal processing in the sfx2 Interface. +State of 5.5.2013 +related modules are: svidl (idl compiler), framework (command processing routines), rsc (resource compiler, see below), vcl (command processing routines) +Here is a chart how the "slot-model" of the command processing framework works. + +Menu commands and Key accelerators are stored +asynchronously into a UNO command stack and later executed +seqentially. + + + + +Changing the system: In Order to add a function to a shell, +Add an entry to the .sdi file corresponding to that SfxShell +Example: + +SID_PASTE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] +The "state" method is the method called to checked whether that command is active now. The "exec" method is called when the command should be processed by the shell. Both functions obtain a SfxRequest Object as a parameter, declared in ./include/sfx2/request.hxx. +Each Application Window has ONE Dispatcher. +This registers all SfxShells (or rather their +subclasses) which can get commands from the user AT THE MOMENT. +These shells are created when the edit mode they +are part of is first used, but not discarded until the window closes. +./sfx2/source/control/dispatch.cxx: +void SfxDispatcher::Pop receives Pushes and Pops +of the shell to/from the stack. +The real Pushing/Popping, however, is done during +SfxDispatcher::FlushImpl +Main dispatching routine In +./sfx2/source/control/unoctitm.cxx +SfxDispatchController_Impl::dispatch. + +SfxDispatchController::_FindServer +gets the SfxInterfaces of the shells. They are defined by macro calls +to SFX_IMPL_INTERFACE, defined in include/sfx2/shell.hxx . + +Upon GetInterface, they yield their pInterface, +which, upon GetSlot, returns a SfxSlot of that Shell +For that command, which is then Executed with +Dispatcher::Execute. +If the program is set into another mode, for +example by clicking a hovering object in writer +after Text editing, all shells are removed from +the dispatcher and new shells are pushed +to match the current mode. + + How to build menus +In order to introduce a menu command, the uno command must be linked to a slot name. +This is done in different sdi files, such as sfx2/sdi/sfx.sdi. +There, you define the slot: +Structure: + + + +SfxVoidItem uno_name_the_part_after_colon SID_COMMAND_NAME +() +[ + /* initialization of variables is coming here */ +] + + +In ./include/sfx2/sfxsids.hrc, the defines of the slot names and their numbers are entered. The numbers are just needed because definitions cannot be enums, and for compatibility. + +In ./officecfg/registry/data/org/openoffice/Office/UI, +there are .xcu ended xml files that define the single menu items. +They contain the US- language name and the .uno: command. +In ./include/sfx2/sfxcommands.h, the uno command names are listed. + + + +The resource compiler, which creates files some GetState methods refer to, is in the ./rsc directory. It is a separate executable, invoked at compile time. + + + + \ No newline at end of file diff --git a/sfx2/doc/sfx2doc.odg b/sfx2/doc/sfx2doc.odg deleted file mode 100644 index 01d13bb..000 --- a/sfx2/doc/sfx2doc.odg +++ /dev/null Binary files differ diff --git a/sfx2/doc/sfx2doc
[PATCH] fdo#55430 allowing click-from-textmode without causing fdo#6...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2786 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/2786/1 fdo#55430 allowing click-from-textmode without causing fdo#61025 the last fix for #55430 caused #61025. Markus Mohrhardt fixed that with by removing parts of the calc part in 16f6ef0423cd0fd7c0e50ee28e8b32e72e21e090 I got it back where it causes no harm to the labels. Change-Id: Ifb366a004701d7ec93b2e14dba850d500e60 Signed-off-by: Lennard Wasserthal --- M sc/source/ui/drawfunc/fudraw.cxx M sc/source/ui/drawfunc/futext.cxx M sc/source/ui/inc/fudraw.hxx 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 59922ae..fc72d7b 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -768,6 +768,21 @@ } } +sal_Bool FuDraw::IsEditingANote( const MouseEvent& rMEvt ) const +{ +const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); +sal_Int32 backval=rMarkList.GetMarkCount(); +for (sal_Int32 nlv1=0;nlv1GetMarkedSdrObj(); +if ( ScDrawLayer::IsNoteCaption( pObj ) ) +{ +return true; +} +} +return false; +} + sal_Bool FuDraw::IsSizingOrMovingNote( const MouseEvent& rMEvt ) const { sal_Bool bIsSizingOrMoving = false; diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 02d086a..70be824 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -132,9 +132,19 @@ if ( pView->IsTextEdit() ) { -if( !IsSizingOrMovingNote(rMEvt) ) +if ( IsEditingANote(rMEvt) ) { -StopEditMode();// Danebengeklickt, Ende mit Edit +if( !IsSizingOrMovingNote(rMEvt) ) +{ +StopEditMode();// Danebengeklickt, Ende mit Edit +bStraightEnter = false; +} +} +else +{ +StopEditMode();// Clicked outside, ending edit. +pView->UnmarkAll(); +bStraightEnter = false; } pView->SetCreateMode(); } @@ -322,6 +332,8 @@ else if (pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_BEFOREMARK)) { pView->UnmarkAllObj(); +ScViewData& rViewData = *pViewShell->GetViewData(); + rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); pView->MarkObj(pObj,pPV,false,false); pHdl=pView->PickHandle(aMDPos); @@ -343,6 +355,12 @@ pViewShell->SetActivePointer(pView->GetPreferedPointer( pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow )); +if (!bStraightEnter) +{ +pView->UnmarkAll(); +ScViewData& rViewData = *pViewShell->GetViewData(); +rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); +} // return (bReturn); return sal_True; diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 158b032..fdff18a 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -49,6 +49,7 @@ // II virtual void SelectionHasChanged(); +sal_Bool IsEditingANote( const MouseEvent& rMEvt ) const; sal_Bool IsSizingOrMovingNote( const MouseEvent& rMEvt ) const; private: -- To view, visit https://gerrit.libreoffice.org/2786 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb366a004701d7ec93b2e14dba850d500e60 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: fdo#56886 EMF: Fixes some scaling problems of clipped region...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1886 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/1886/1 fdo#56886 EMF: Fixes some scaling problems of clipped regions, Twips If a Metafile's scaling is incompletely defined, there are some arbitrary values used. Why was this bug not there in aoo 3.3? Maybe because they didn't use the EMF Part of that WMF? This Patch also adds an (untested) TWIPS scaling, which was missing Change-Id: I7c0139853961eb338476a9e3a5e08d3f87225f2e Signed-off-by: Lennard Wasserthal --- M svtools/source/filter/wmf/enhwmf.cxx M svtools/source/filter/wmf/winmtf.cxx M svtools/source/filter/wmf/winmtf.hxx 3 files changed, 107 insertions(+), 15 deletions(-) diff --git a/svtools/source/filter/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx index f8b9884..541d68d 100644 --- a/svtools/source/filter/wmf/enhwmf.cxx +++ b/svtools/source/filter/wmf/enhwmf.cxx @@ -485,8 +485,8 @@ EMFP_DEBUG(printf ("\t\tunknown id: 0x%x\n",(unsigned int) id)); } } -} else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF ) - +} +else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF ) switch( nRecType ) { case EMR_POLYBEZIERTO : @@ -518,14 +518,14 @@ case EMR_SETWINDOWEXTEX : { // #75383# *pWMF >> nW >> nH; -pOut->SetWinExt( Size( nW, nH ) ); +pOut->SetWinExt( Size( nW, nH ), true); } break; case EMR_SETWINDOWORGEX : { *pWMF >> nX32 >> nY32; -pOut->SetWinOrg( Point( nX32, nY32 ) ); +pOut->SetWinOrg( Point( nX32, nY32 ), true); } break; @@ -917,7 +917,7 @@ PolyPolygon aPolyPoly; if ( cbRgnData ) ImplReadRegion( aPolyPoly, *pWMF, nRecSize ); -pOut->SetClipPath( aPolyPoly, iMode, sal_False ); +pOut->SetClipPath( aPolyPoly, iMode, sal_True ); } break; @@ -1352,7 +1352,7 @@ return sal_False; // bound size -Rectangle rclBounds;// rectangle in logical units 1/100th mm +Rectangle rclBounds;// rectangle in logical units *pWMF >> nLeft >> nTop >> nRight >> nBottom; rclBounds.Left() = nLeft; rclBounds.Top() = nTop; @@ -1360,7 +1360,7 @@ rclBounds.Bottom() = nBottom; // picture frame size -Rectangle rclFrame; // rectangle in device units +Rectangle rclFrame; // rectangle in device units 1/100th mm *pWMF >> nLeft >> nTop >> nRight >> nBottom; rclFrame.Left() = nLeft; rclFrame.Top() = nTop; diff --git a/svtools/source/filter/wmf/winmtf.cxx b/svtools/source/filter/wmf/winmtf.cxx index 63b0996..59b1636 100644 --- a/svtools/source/filter/wmf/winmtf.cxx +++ b/svtools/source/filter/wmf/winmtf.cxx @@ -352,6 +352,20 @@ //--- //--- +Point WinMtfOutput::ImplScale( const Point& rPt)//Hack to set varying defaults for incompletely defined files. +{ +if (mbIsMapDevSet && mbIsMapWinSet) +{ +return Point((rPt.X())*mnWinExtX/mnDevWidth-mrclFrame.Left(),(rPt.Y())*mnWinExtY/mnDevHeight-mrclFrame.Top()); +} +else +{ +return Point((rPt.X())*32-mrclFrame.Left(),(rPt.Y())*32-mrclFrame.Top()); +} +} + +//--- + Point WinMtfOutput::ImplMap( const Point& rPt ) { if ( mnWinExtX && mnWinExtY ) @@ -395,6 +409,16 @@ fY2 = mnWinOrgY-fY2; fX2 *= 2.540; fY2 *= 2.540; +fX2 += mnDevOrgX; +fY2 += mnDevOrgY; +} +break; +case MM_TWIPS: +{ +fX2 -= mnWinOrgX; +fY2 = mnWinOrgY-fY2; +fX2 *= 1.7639; +fY2 *= 1.7639; fX2 += mnDevOrgX; fY2 += mnDevOrgY; } @@ -486,6 +510,12 @@ fHeight *= -1; } break; +case MM_TWIPS: +{ +fWidth *= 1.7639; +fHeight*=-1.7639; +} +break; default : { fWidth /= mnWinExtX; @@ -539,6 +569,27 @@ rPolygon[ i ] = ImplMap( rPolygon[ i ] ); } return rPolygon; +} + +//--
[PATCH] Documentation for sfx2
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1599 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/1599/1 Documentation for sfx2 Change-Id: Id0df71664891ad2ced5336a7eea65c03353bbd92 Signed-off-by: Lennard Wasserthal --- A sfx2/doc/sfx2doc.odg 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sfx2/doc/sfx2doc.odg b/sfx2/doc/sfx2doc.odg new file mode 100644 index 000..01d13bb --- /dev/null +++ b/sfx2/doc/sfx2doc.odg Binary files differ -- To view, visit https://gerrit.libreoffice.org/1599 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0df71664891ad2ced5336a7eea65c03353bbd92 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#55582 writer, calc: insert shapes also when shapes selec...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1524 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/1524/1 fdo#55582 writer, calc: insert shapes also when shapes selected In writer, Pasting shapes overwrote others that were selected. In calc, the edit mode when shapes were selected had no paste function. Change-Id: I9f4c4b674c5a439aade5ce943f3b34577f8e2281 Signed-off-by: Lennard --- M sc/sdi/drawsh.sdi M sc/source/ui/drawfunc/drawsh5.cxx M sw/source/ui/dochdl/swdtflvr.cxx 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index ab2337f..914b53d 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -143,6 +143,7 @@ SID_DELETE_CONTENTS [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_CUT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_COPY[ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] +SID_PASTE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_SELECTALL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_OBJECT_ROTATE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] SID_OBJECT_MIRROR [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index fa4c2ec..0f2fc17 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -357,7 +358,7 @@ break; case SID_PASTE: -OSL_FAIL( "SdrView::PasteClipboard not supported anymore" ); +ScClipUtil::PasteFromClipboard ( GetViewData(), GetViewData()->GetViewShell(), true ); break; case SID_SELECTALL: diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 2267a66..88cc4f4 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -3065,8 +3065,8 @@ bool bKillPaMs = false; -//Delete selected content, not at table-selection and table in Clipboard -if( rShell.HasSelection() && !( nSelection & nsSelectionType::SEL_TBL_CELLS)) +//Delete selected content, not at table-selection and table in Clipboard, and dont delete hovering graphics. +if( rShell.HasSelection() && !( nSelection & nsSelectionType::SEL_TBL_CELLS) && !( nSelection & nsSelectionType::SEL_DRW)) { bKillPaMs = true; rShell.SetRetainSelection( true ); @@ -3083,6 +3083,10 @@ } rShell.SetRetainSelection( false ); } +if ( nSelection & nsSelectionType::SEL_DRW) //unselect hovering graphics +{ + rShell.ResetSelect(NULL,false); +} sal_Bool bInWrd = sal_False, bEndWrd = sal_False, bSttWrd = sal_False, bSmart = 0 != (TRNSFR_DOCUMENT_WORD & eBufferType); -- To view, visit https://gerrit.libreoffice.org/1524 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f4c4b674c5a439aade5ce943f3b34577f8e2281 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#56976 fixes up Arrow import bug
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1492 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/1492/1 fdo#56976 fixes up Arrow import bug Importing an LibreOffice upArrow from an pptx document caused it and several custom shapes go down the drain. That was perhaps a memory violation because the procedure to generate it in working memory was missing. This patch gets you that procedure. Note it cannot be manipulated yet. Change-Id: I8b9ce3ae1aef7894ab04b9857e90831d715ec1d5 Signed-off-by: Lennard --- M oox/source/drawingml/customshapepresets4.cxx M oox/source/export/shapes.cxx 2 files changed, 218 insertions(+), 0 deletions(-) diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx index 4aee3a2d..81f7688 100644 --- a/oox/source/drawingml/customshapepresets4.cxx +++ b/oox/source/drawingml/customshapepresets4.cxx @@ -1652,6 +1652,222 @@ return aPropertyMap; } }; +class ShapeCupArrow : public CustomShapeProvider +{ + virtual PropertyMap getProperties() + { +PropertyMap aPropertyMap; + +{ +Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2); +{ +Any aAny ((sal_Int32) 5); +aAdjSequence [0].Value = aAny; +aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); +} +{ +Any aAny ((sal_Int32) 5); +aAdjSequence [1].Value = aAny; +aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); +} +aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; +} +{ +static const char *aStrings[] = { +"min(logwidth,logheight)", +"10*logheight/?0 ", +"if(0-$0 ,0,if(10-$0 ,$0 ,10))", +"if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))", +"?0 *?3 /10", +"0+?4 -0", +"logwidth*?2 /20", +"logwidth/2", +"?7 +0-?6 ", +"?7 +?6 -0", +"logwidth/2", +"?8 *?4 /?10 ", +"?5 +0 -?11", +"logwidth", +"logheight" +}; +aPropertyMap [PROP_Equations] <<= createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ); +} +{ +Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2); +{ +Sequence< PropertyValue > aPropSequence (4); +{ +aPropSequence [0].Name = CREATE_OUSTRING ("Position"); +static const CustomShapeProvider::ParameterPairData aData = +{ +EnhancedCustomShapeParameterType::EQUATION, +EnhancedCustomShapeParameterType::EQUATION, +8, 14 +}; +aPropSequence [0].Value = makeAny (createParameterPair(&aData)); +} +{ +aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); +EnhancedCustomShapeParameter aParameter; +Any aAny ((sal_Int32) 10); +aParameter.Value = aAny; +aParameter.Type = EnhancedCustomShapeParameterType::NORMAL; +aPropSequence [1].Value = makeAny (aParameter); +} +{ +aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); +EnhancedCustomShapeParameter aParameter; +Any aAny ((sal_Int32) 0); +aParameter.Value = aAny; +aParameter.Type = EnhancedCustomShapeParameterType::NORMAL; +aPropSequence [2].Value = makeAny (aParameter); +} +{ +aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); +Any aAny ((sal_Int32) 0); +aPropSequence [3].Value = makeAny (aAny); +} +aPropSequenceSequence [0] = aPropSequence; +} +{ +Sequence< PropertyValue > aPropSequence (4); +{ +aPropSequence [0].Name = CREATE_OUSTRING ("Position"); +static const CustomShapeProvider::ParameterPairData aData = +{ +EnhancedCustomShapeParameterType::NORMAL, +EnhancedCustomShapeParameterType::EQUATION, +0, 5 +}; +aPropSequence [0].Value = makeAny (createParameterPair(&aData)); +} +{ +aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); +EnhancedCustomShapeParameter aParameter; +Any aAny ((sal_Int32) 1); +aParameter.Value = aAny; +aParameter.Type = EnhancedCustomShapeParameterType::EQUATION; +aPropSequence [1].Value = makeAny (aParameter); +} +{ +aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); +En
[PATCH] fdo#55430 switches off text mode when clicking an other obje...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1344 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/1344/1 fdo#55430 switches off text mode when clicking an other object. This patch complements Iee4abf4eddf79ef7ed331221b0a0b23d3370ae2b (and I69aecacc264c9a9b766ccfa48c0deb1f153e88da, which didn't correctly before) This also fixes issues when clicking on another object to stop text editing. Switches off text mode, and instantaneously selects the other object. (Rotation doesn't belong into the text routine AT ALL, which also caused bug 37482, which is resolved differently from now on) Known issues: text mode stays on when you youse drag'n drop. Won't work in calc. The oldest patch for fdo#55430 doesn't work in writer. So writer will respond unexpectedly. Change-Id: I3c8cdedbfae58165ebeda5887c1b6573832eb495 Signed-off-by: Lennard --- M sd/source/ui/func/fusel.cxx M sd/source/ui/func/futext.cxx 2 files changed, 14 insertions(+), 10 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1344 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c8cdedbfae58165ebeda5887c1b6573832eb495 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx import/export non-breaking hyphen and soft hyphen
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1279 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/1279/1 docx import/export non-breaking hyphen and soft hyphen God made non-breaking hyphen and saw that it was gone he told us to fix it as soon as hell we promised that we would Change-Id: I1d2bb8f7542f5ffec36fafdbdb07ace1cb62fb4a Signed-off-by: Lennard --- M sw/source/filter/ww8/docxattributeoutput.cxx M writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 2 files changed, 16 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1279 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d2bb8f7542f5ffec36fafdbdb07ace1cb62fb4a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix position correction for flipped shapes
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1250 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1250/1 fix position correction for flipped shapes This complements change ef3f5a37a4ff0d86911903fc6e6083e182b67dd5. The Translation-compensation of that fix didn't work for flipped shapes. Also, vertically flipped shapes made problems. Also 360 °C = 0°C (drawingml.hxx) I didn't dare to fix it earlier because there is some problem with the selection frames. But that is an import bug, not caused by some export stuff! This import bug makes the manipulation rectangles around the shapes flipped & turning in the wrong direction, perhaps due to CroftCro$oft clockwisification! Change-Id: I05aa036d31cd5d9a8b194897b3d92ec12d6d2c61 Signed-off-by: Lennard --- M oox/inc/oox/export/drawingml.hxx M oox/source/export/drawingml.cxx 2 files changed, 9 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1250 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05aa036d31cd5d9a8b194897b3d92ec12d6d2c61 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#34897 numbers were wrong, code unnecessary
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1165 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/1165/1 fdo#34897 numbers were wrong, code unnecessary also working, but worse: if (nAngle==900) { AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflBtoT ); bSuppressRotation=true; } if (nAngle==2700) { AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflTtoBA ); bSuppressRotation=true; } but: text flow is perhaps not intended to specify rotation, created data may misbehave on other applications, and there is no reason for this unnecessary special case. (Especially obvious because there is no text flow that causes 180 deg rotation.) Change-Id: I0b1cac78e549c2126d7e45298629e28fc76ac95d Signed-off-by: Lennard --- M filter/source/msfilter/escherex.cxx 1 file changed, 0 insertions(+), 12 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1165 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b1cac78e549c2126d7e45298629e28fc76ac95d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#55430 click object in front of current after editing tex...
Lennard Wasserthal has restored this change. Change subject: fdo#55430 click object in front of current after editing text .. Patch Set 4: Restored Damn, I just wanted to clear the history when I changed the title over and over again. (because the lines were to long) -- To view, visit https://gerrit.libreoffice.org/1037 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: I69aecacc264c9a9b766ccfa48c0deb1f153e88da Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal Gerrit-Reviewer: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#55430 click object in front of current after editing tex...
Lennard Wasserthal has abandoned this change. Change subject: fdo#55430 click object in front of current after editing text .. Patch Set 4: Abandoned pressed the wrong button -- To view, visit https://gerrit.libreoffice.org/1037 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I69aecacc264c9a9b766ccfa48c0deb1f153e88da Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal Gerrit-Reviewer: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#55430 can also click object in front of current after ed...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1037 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/1037/1 fdo#55430 can also click object in front of current after editing text. additional patch for 55430, patch 85ea03ae536831649b104694d08dced4d4c8663f failed when underlying object was in text selection mode. This one compensates that! Change-Id: I69aecacc264c9a9b766ccfa48c0deb1f153e88da Signed-off-by: Lennard --- M sd/source/ui/func/futext.cxx 1 file changed, 12 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1037 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I69aecacc264c9a9b766ccfa48c0deb1f153e88da Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#45495 pptx Export saves rotation of pictures, shapes, text
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1030 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/1030/1 fdo#45495 pptx Export saves rotation of pictures,shapes,text and Circular and Rectangular shapes, and Tables drawingml was Pivot corrected. There is still some work to be done. Tables cannot be rotated anyway, but in contrast to Lines, you don't doubly-save the rotation. Change-Id: I0d650e669a690164796150615416fab8bb90242b Signed-off-by: Lennard --- M oox/inc/oox/export/drawingml.hxx M oox/source/export/drawingml.cxx M oox/source/export/shapes.cxx 3 files changed, 17 insertions(+), 8 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1030 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d650e669a690164796150615416fab8bb90242b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#55430 allow clicking objects in front of selected ones
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/927 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/927/1 fdo#55430 allow clicking objects in front of selected ones Prevents that selected objects shadow selecting others in front of them. Change-Id: Iee4abf4eddf79ef7ed331221b0a0b23d3370ae2b Signed-off-by: Lennard --- M sd/source/ui/func/fusel.cxx M svx/inc/svx/svdmrkv.hxx M svx/source/svdraw/svdmrkv.cxx 3 files changed, 32 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/927 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee4abf4eddf79ef7ed331221b0a0b23d3370ae2b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] comment translations german->english sd fusel.cxx and fusel....
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/869 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/869/1 comment translations german->english sd fusel.cxx and fusel.hxx Change-Id: Iea730a65e4c3a611e30e0f1ee34d291fbdc98c92 Signed-off-by: Lennard --- M sd/source/ui/func/fusel.cxx M sd/source/ui/inc/fusel.hxx 2 files changed, 66 insertions(+), 66 deletions(-) -- To view, visit https://gerrit.libreoffice.org/869 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea730a65e4c3a611e30e0f1ee34d291fbdc98c92 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fixes Circular arrow distortion, Bug #46272
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/679 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/679/1 Fixes Circular arrow distortion, Bug #46272 Distortion occurred when angle mod 90° != 0 All of my past & future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license - Lennard Wasserthal Change-Id: I4af7e7f1dcbc4d1262592c362532df4957e52399 Signed-off-by: Lennard --- M svx/source/customshapes/EnhancedCustomShape2d.cxx 1 file changed, 2 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/679 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4af7e7f1dcbc4d1262592c362532df4957e52399 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice