[Libreoffice-commits] core.git: Changes to 'refs/changes/24/1524/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/582/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/1524/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/582/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/8907/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/3872/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/3871/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/8866/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/1886/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/2786/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/2786/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/1886/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/8935/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/99/1599/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/99/1599/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/1886/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/2786/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/8866/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/57/5857/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/57/5857/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/1886/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/1886/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/8935/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/1344/11'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - comphelper/source embeddedobj/source sw/source
comphelper/source/misc/mimeconfighelper.cxx|7 ++-
embeddedobj/source/commonembedding/persistence.cxx | 18 ++
sw/source/core/uibase/dochdl/swdtflvr.cxx |8 ++--
3 files changed, 30 insertions(+), 3 deletions(-)
New commits:
commit b7cb2ae5026cfd3bb30f148ed40f244b5c128876
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Sep 7 14:00:01 2013 +0200
fdo#55582 Writer: Dont overwrite from even when selected, from writer.
This patch fixes the writer part, calc part is fixed long ago.
Problem: it overwrites when you paste from impress or calc.
This allows to keep the graphic's frame,
so the text doesn't have to be rearranged.
(i.e. it is desired, so I didn't change that)
I was trying to give the user a choice,
but I didn't succeed in keeping the frame when pasting from writer to
writer.
coming soon!
Change-Id: I07271df9bb501779d06f332bb13edd05f0aefacb
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx
b/sw/source/core/uibase/dochdl/swdtflvr.cxx
index 447dbfd..62938d5 100644
--- a/sw/source/core/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx
@@ -3203,8 +3203,8 @@ bool SwTransferable::PrivatePaste( SwWrtShell rShell )
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 );
@@ -3221,6 +3221,10 @@ bool SwTransferable::PrivatePaste( SwWrtShell rShell )
}
rShell.SetRetainSelection( false );
}
+if ( nSelection nsSelectionType::SEL_DRW) //unselect hovering graphics
+{
+ rShell.ResetSelect(NULL,false);
+}
bool bInWrd = false, bEndWrd = false, bSttWrd = false,
bSmart = 0 != (TRNSFR_DOCUMENT_WORD eBufferType);
commit 0b3d0fb2d9256dc6bae6af69ed494487004def75
Author: Michael Stahl mst...@redhat.com
Date: Thu May 15 23:28:55 2014 +0200
fdo#78159: fix import of OOoXML embedded objects
MimeConfigurationHelper::GetDefaultFilterFromServiceName() checks that
there is both an import and an export filter, and for OOoXML the export
has been removed; tweak the check to require only import for OOoXML.
Currently it still works invoke the OOoXML filter, but it is clearly
better to store the embedded documents only in ODF, so tweak
OCommonEmbeddedObject::store* methods to do that.
(regression from aeeaccf59abbc485d7786486f1accc1cb4d4dbf7)
Change-Id: Ib71f23fd110cbd4b570517f2dde2c53e3aa6301d
diff --git a/comphelper/source/misc/mimeconfighelper.cxx
b/comphelper/source/misc/mimeconfighelper.cxx
index 6f25f00..249f474 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -743,7 +743,12 @@ OUString
MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUStrin
sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault(
Flags, (sal_Int32)0 );
// that should be import, export, own filter and not a
template filter ( TemplatePath flag )
-sal_Int32 nRequired = ( SFX_FILTER_OWN |
SFX_FILTER_EXPORT | SFX_FILTER_IMPORT );
+sal_Int32 const nRequired = (SFX_FILTER_OWN
+// fdo#78159 for OOoXML, there is code to convert
+// to ODF in OCommonEmbeddedObject::store*
+// so accept it even though there's no export
+| (SOFFICE_FILEFORMAT_60 == nVersion ? 0 :
SFX_FILTER_EXPORT)
+| SFX_FILTER_IMPORT );
if ( ( ( nFlags nRequired ) == nRequired ) !(
nFlags SFX_FILTER_TEMPLATEPATH ) )
{
// if there are more than one filter the preffered
one should be used
diff --git a/embeddedobj/source/commonembedding/persistence.cxx
b/embeddedobj/source/commonembedding/persistence.cxx
index 2db77f65..4d2ddc8 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1165,6 +1165,12 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const
uno::Reference embed::
{
SAL_WARN( embeddedobj.common, Can not retrieve target storage media
type! );
}
+if (nTargetStorageFormat == SOFFICE_FILEFORMAT_60)
+{
+SAL_INFO(embeddedobj.common, fdo#78159: Storing OOoXML as ODF);
+nTargetStorageFormat = SOFFICE_FILEFORMAT_CURRENT
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-6' - sw/source
sw/source/ui/docvw/edtwin.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit a0fb0d938434477898ee8b54bc7da523d5120ea0
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Apr 5 11:55:24 2014 +0200
fdo#69157 Apply object-in front selection on mouseUp
Before, all selection was recklessly replaced when you clicked something
else than a scaling handle (or the like).
It caused bug 69157.
But now, you can still drag the frame by gripping the interior one.
Btw, that the timer did not correctly start was because of the return
statement in the prior state.
Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 351ab7b879a1e5bf879600bf47909181029a4d11)
Reviewed-on: https://gerrit.libreoffice.org/8907
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit c7cec7bb9ea7ef0aaa18a5c39eca13c446f974c5)
Reviewed-on: https://gerrit.libreoffice.org/8935
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 3dd87c0..cd838c0 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2618,8 +2618,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
{
SwWrtShell rSh = m_rView.GetWrtShell();
-SdrObject* pObj;
-SdrPageView* pPV;
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the mouse
// button down event. Otherwise we would crash (context menu has been
@@ -2936,12 +2934,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
// only if no position to size was hit.
if (!bHitHandle)
{
-if (pSdrView-PickObj(aDocPos,
pSdrView-getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER |
SDRSEARCH_BEFOREMARK))
-{
-pSdrView-UnmarkAllObj();
-
pSdrView-MarkObj(pObj,pPV,false,false);
-return;
-}
StartDDTimer();
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
@@ -4029,6 +4021,8 @@ void SwEditWin::MouseMove(const MouseEvent _rMEvt)
*/
void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
{
+SdrObject* pObj;
+SdrPageView* pPV;
bool bCallBase = true;
sal_Bool bCallShadowCrsr = m_bWasShdwCrsr;
@@ -4080,6 +4074,15 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
bFrmDrag = false;
}
bNoInterrupt = false;
+const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
+if ((PixelToLogic(m_aStartPos).Y() == (aDocPos.Y()))
(PixelToLogic(m_aStartPos).X() == (aDocPos.X(//To make sure it was not moved
+{
+if (pSdrView-PickObj(aDocPos, pSdrView-getHitTolLog(), pObj,
pPV, SDRSEARCH_ALSOONMASTER ))
+{
+pSdrView-UnmarkAllObj();
+pSdrView-MarkObj(pObj,pPV,false,false);
+}
+}
ReleaseMouse();
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 5 commits - officecfg/registry sc/source sw/source writerfilter/source
officecfg/registry/data/org/openoffice/Office/Paths.xcu |1
sc/source/core/data/column3.cxx | 100 --
sc/source/ui/docshell/docsh8.cxx| 112 +++-
sc/source/ui/inc/namedlg.hxx|5
sc/source/ui/inc/namemgrtable.hxx | 12 +
sc/source/ui/namedlg/namedlg.cxx| 17 +-
sc/source/ui/namedlg/namemgrtable.cxx | 14 +-
sw/source/ui/docvw/edtwin.cxx | 19 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 -
9 files changed, 214 insertions(+), 73 deletions(-)
New commits:
commit 8992620a8e56250f4770e7379539956c89c6a5de
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Apr 5 11:55:24 2014 +0200
fdo#69157 Apply object-in front selection on mouseUp
Before, all selection was recklessly replaced when you clicked something
else than a scaling handle (or the like).
It caused bug 69157.
But now, you can still drag the frame by gripping the interior one.
Btw, that the timer did not correctly start was because of the return
statement in the prior state.
Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 351ab7b879a1e5bf879600bf47909181029a4d11)
Reviewed-on: https://gerrit.libreoffice.org/8907
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 3dd87c0..cd838c0 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2618,8 +2618,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
{
SwWrtShell rSh = m_rView.GetWrtShell();
-SdrObject* pObj;
-SdrPageView* pPV;
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the mouse
// button down event. Otherwise we would crash (context menu has been
@@ -2936,12 +2934,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
// only if no position to size was hit.
if (!bHitHandle)
{
-if (pSdrView-PickObj(aDocPos,
pSdrView-getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER |
SDRSEARCH_BEFOREMARK))
-{
-pSdrView-UnmarkAllObj();
-
pSdrView-MarkObj(pObj,pPV,false,false);
-return;
-}
StartDDTimer();
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
@@ -4029,6 +4021,8 @@ void SwEditWin::MouseMove(const MouseEvent _rMEvt)
*/
void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
{
+SdrObject* pObj;
+SdrPageView* pPV;
bool bCallBase = true;
sal_Bool bCallShadowCrsr = m_bWasShdwCrsr;
@@ -4080,6 +4074,15 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
bFrmDrag = false;
}
bNoInterrupt = false;
+const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
+if ((PixelToLogic(m_aStartPos).Y() == (aDocPos.Y()))
(PixelToLogic(m_aStartPos).X() == (aDocPos.X(//To make sure it was not moved
+{
+if (pSdrView-PickObj(aDocPos, pSdrView-getHitTolLog(), pObj,
pPV, SDRSEARCH_ALSOONMASTER ))
+{
+pSdrView-UnmarkAllObj();
+pSdrView-MarkObj(pObj,pPV,false,false);
+}
+}
ReleaseMouse();
return;
}
commit 52e8cf6b55ace96d962d3f3ef1dd4cce28858c86
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 11 11:10:14 2014 +0100
check that stacks are not empty before top()
Change-Id: Iad5b3381b8201c5ac32a5bdf99bd3d5872ea3afc
(cherry picked from commit a1ea3838adee634ccf725bc5f2be7805c6294a16)
Reviewed-on: https://gerrit.libreoffice.org/8933
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6f908a8..a696e12 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1245,6 +1245,9 @@ void DomainMapper_Impl::appendTextContent(
const uno::Sequence beans::PropertyValue xPropertyValues
)
{
+SAL_WARN_IF(m_aTextAppendStack.empty(), writerfilter.dmapper, no text
append stack);
+if (m_aTextAppendStack.empty
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/docvw/edtwin.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit c7cec7bb9ea7ef0aaa18a5c39eca13c446f974c5
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Apr 5 11:55:24 2014 +0200
fdo#69157 Apply object-in front selection on mouseUp
Before, all selection was recklessly replaced when you clicked something
else than a scaling handle (or the like).
It caused bug 69157.
But now, you can still drag the frame by gripping the interior one.
Btw, that the timer did not correctly start was because of the return
statement in the prior state.
Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 351ab7b879a1e5bf879600bf47909181029a4d11)
Reviewed-on: https://gerrit.libreoffice.org/8907
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 3dd87c0..cd838c0 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2618,8 +2618,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
{
SwWrtShell rSh = m_rView.GetWrtShell();
-SdrObject* pObj;
-SdrPageView* pPV;
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the mouse
// button down event. Otherwise we would crash (context menu has been
@@ -2936,12 +2934,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
// only if no position to size was hit.
if (!bHitHandle)
{
-if (pSdrView-PickObj(aDocPos,
pSdrView-getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER |
SDRSEARCH_BEFOREMARK))
-{
-pSdrView-UnmarkAllObj();
-
pSdrView-MarkObj(pObj,pPV,false,false);
-return;
-}
StartDDTimer();
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
@@ -4029,6 +4021,8 @@ void SwEditWin::MouseMove(const MouseEvent _rMEvt)
*/
void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
{
+SdrObject* pObj;
+SdrPageView* pPV;
bool bCallBase = true;
sal_Bool bCallShadowCrsr = m_bWasShdwCrsr;
@@ -4080,6 +4074,15 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
bFrmDrag = false;
}
bNoInterrupt = false;
+const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
+if ((PixelToLogic(m_aStartPos).Y() == (aDocPos.Y()))
(PixelToLogic(m_aStartPos).X() == (aDocPos.X(//To make sure it was not moved
+{
+if (pSdrView-PickObj(aDocPos, pSdrView-getHitTolLog(), pObj,
pPV, SDRSEARCH_ALSOONMASTER ))
+{
+pSdrView-UnmarkAllObj();
+pSdrView-MarkObj(pObj,pPV,false,false);
+}
+}
ReleaseMouse();
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/uibase/docvw/edtwin.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 5b21eea4b737abe9684da937423540963c7265d6
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Apr 5 11:55:24 2014 +0200
fdo#69157 Apply object-in front selection on mouseUp
Before, all selection was recklessly replaced when you clicked something
else than a scaling handle (or the like).
It caused bug 69157.
But now, you can still drag the frame by gripping the interior one.
Btw, that the timer did not correctly start was because of the return
statement in the prior state.
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Conflicts:
sw/source/core/uibase/docvw/edtwin.cxx
Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx
b/sw/source/core/uibase/docvw/edtwin.cxx
index b133211..2534400 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -3079,14 +3079,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
// only if no position to size was hit.
if (!bHitHandle)
{
-SdrObject* pObj;
-SdrPageView* pPV;
-if (pSdrView-PickObj(aDocPos,
pSdrView-getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER |
SDRSEARCH_BEFOREMARK))
-{
-pSdrView-UnmarkAllObj();
-
pSdrView-MarkObj(pObj,pPV,false,false);
-return;
-}
StartDDTimer();
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
@@ -4243,6 +4235,17 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
bFrmDrag = false;
}
bNoInterrupt = false;
+const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
+if ((PixelToLogic(m_aStartPos).Y() == (aDocPos.Y()))
(PixelToLogic(m_aStartPos).X() == (aDocPos.X(//To make sure it was not moved
+{
+SdrObject* pObj;
+SdrPageView* pPV;
+if (pSdrView-PickObj(aDocPos, pSdrView-getHitTolLog(), pObj,
pPV, SDRSEARCH_ALSOONMASTER ))
+{
+pSdrView-UnmarkAllObj();
+pSdrView-MarkObj(pObj,pPV,false,false);
+}
+}
ReleaseMouse();
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/ui/docvw/edtwin.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 351ab7b879a1e5bf879600bf47909181029a4d11
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Apr 5 11:55:24 2014 +0200
fdo#69157 Apply object-in front selection on mouseUp
Before, all selection was recklessly replaced when you clicked something
else than a scaling handle (or the like).
It caused bug 69157.
But now, you can still drag the frame by gripping the interior one.
Btw, that the timer did not correctly start was because of the return
statement in the prior state.
Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 7e978d0..7927987 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2776,8 +2776,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
{
SwWrtShell rSh = m_rView.GetWrtShell();
-SdrObject* pObj;
-SdrPageView* pPV;
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the mouse
// button down event. Otherwise we would crash (context menu has been
@@ -3091,12 +3089,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
// only if no position to size was hit.
if (!bHitHandle)
{
-if (pSdrView-PickObj(aDocPos,
pSdrView-getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER |
SDRSEARCH_BEFOREMARK))
-{
-pSdrView-UnmarkAllObj();
-
pSdrView-MarkObj(pObj,pPV,false,false);
-return;
-}
StartDDTimer();
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
@@ -4194,6 +4186,8 @@ void SwEditWin::MouseMove(const MouseEvent _rMEvt)
*/
void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
{
+SdrObject* pObj;
+SdrPageView* pPV;
bool bCallBase = true;
sal_Bool bCallShadowCrsr = m_bWasShdwCrsr;
@@ -4245,6 +4239,15 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
bFrmDrag = false;
}
bNoInterrupt = false;
+const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
+if ((PixelToLogic(m_aStartPos).Y() == (aDocPos.Y()))
(PixelToLogic(m_aStartPos).X() == (aDocPos.X(//To make sure it was not moved
+{
+if (pSdrView-PickObj(aDocPos, pSdrView-getHitTolLog(), pObj,
pPV, SDRSEARCH_ALSOONMASTER ))
+{
+pSdrView-UnmarkAllObj();
+pSdrView-MarkObj(pObj,pPV,false,false);
+}
+}
ReleaseMouse();
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/sdi sc/source
sc/sdi/drawsh.sdi |1 + sc/source/ui/drawfunc/drawsh5.cxx |3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 9fa5c64eeb5d038a5fac25dfd80e72bd22b5ed18 Author: Lennard Wasserthal wassert...@nefkom.net Date: Sun May 12 17:50:12 2013 +0200 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 wassert...@nefkom.net Reviewed-on: https://gerrit.libreoffice.org/3872 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr 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 @@ interface TableDraw 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 sfx2/request.hxx #include sfx2/bindings.hxx #include tools/urlobj.hxx +#include cliputil.hxx #include svx/svxdlg.hxx #include svx/dialogs.hrc #include svx/fmglob.hxx @@ -357,7 +358,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest rReq ) break; case SID_PASTE: -OSL_FAIL( SdrView::PasteClipboard not supported anymore ); +ScClipUtil::PasteFromClipboard ( GetViewData(), GetViewData()-GetViewShell(), true ); break; case SID_SELECTALL: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[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 wassert...@nefkom.net --- 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 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN +HTML +BODY LANG=de-DE DIR=LTR +P CLASS=westernSignal processing in the sfx2 Interface. +State of 5.5.2013BRBR +related modules are: svidl (idl compiler), framework (command processing routines), rsc (resource compiler, see below), vcl (command processing routines)BR +Here is a chart how the slot-model of the command processing framework works. +BR +Menu commands and Key accelerators are stored +asynchronously into a UNO command stack and later executed +seqentially.BR +/P +P CLASS=western STYLE=margin-bottom: 0.5cmIMG SRC=sfx2doc0001.svg NAME=Grafik1 ALIGN=BOTTOM WIDTH=950 HEIGHT=350 BORDER=0/P +P CLASS=western STYLE=margin-bottom: 0.5cmBRBR + +Changing the system: bIn Order to add a function to a shell, +Add an entry to the .sdi file corresponding to that SfxShell/bBR +FONT style=color: redExample:/FONT +BR +PREFONT style=background-color: black color=whiteSID_PASTE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]/FONT/PREBR +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.BR +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. +BR +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. +BR +B How to build menus/BBR +In order to introduce a menu command, the uno command must be linked to a slot name.BR +This is done in different sdi files, such as sfx2/sdi/sfx.sdi. +There, you Udefine/U the slot:BR +FONT style=color: redStructure:/FONT + +PRE +FONT style=background-color: black color=white +SfxVoidItem uno_name_the_part_after_colon SID_COMMAND_NAME +() +[ + /* initialization of variables is coming here */ +] +/PRE +/FONT +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.BR + +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
[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 wassert...@nefkom.net --- 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 sfx2/request.hxx #include sfx2/bindings.hxx #include tools/urlobj.hxx +#include cliputil.hxx #include svx/svxdlg.hxx #include svx/dialogs.hrc #include svx/fmglob.hxx @@ -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 wassert...@nefkom.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/drawfunc/fudraw.cxx | 15 +++
sc/source/ui/drawfunc/futext.cxx | 22 --
sc/source/ui/inc/fudraw.hxx |1 +
3 files changed, 36 insertions(+), 2 deletions(-)
New commits:
commit b71d3ad1fd71092e4cc85f5bb96b3bc3347e55d2
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sun Mar 17 10:41:15 2013 +0100
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 wassert...@nefkom.net
Reviewed-on: https://gerrit.libreoffice.org/2786
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
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 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
}
+sal_Bool FuDraw::IsEditingANote( const MouseEvent rMEvt ) const
+{
+const SdrMarkList rMarkList = pView-GetMarkedObjectList();
+sal_Int32 backval=rMarkList.GetMarkCount();
+for (sal_Int32 nlv1=0;nlv1backval;nlv1++)
+{
+SdrObject* pObj = rMarkList.GetMark( nlv1 )-GetMarkedSdrObj();
+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 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent rMEvt)
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 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent rMEvt)
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 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent rMEvt)
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 @@ class FuDraw : public FuPoor
// II
virtual void SelectionHasChanged();
+sal_Bool IsEditingANote( const MouseEvent rMEvt ) const;
sal_Bool IsSizingOrMovingNote( const MouseEvent rMEvt ) const;
private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/wmf/enhwmf.cxx | 14 ++--
vcl/source/filter/wmf/winmtf.cxx | 123 ---
vcl/source/filter/wmf/winmtf.hxx | 19 +-
3 files changed, 127 insertions(+), 29 deletions(-)
New commits:
commit 3998d1abb291309ddbbc2c9869736ebb1ea608f0
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Feb 9 13:47:38 2013 +0100
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.
This bug is just filed as regression because aoo 3.3 used the WMF part and
Lo the EMF part!
Please use environment variable EMF_PLUS_DISABLE if you have further
problems with EMF files.
This Patch also adds an (untested) TWIPS scaling, which was missing.
known issue: vertical text ratio still scaled differently than lineart.
Change-Id: I7c0139853961eb338476a9e3a5e08d3f87225f2e
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Reviewed-on: https://gerrit.libreoffice.org/1886
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index f8b9884..541d68d 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -485,8 +485,8 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
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 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
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 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
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 @@ sal_Bool EnhWMFReader::ReadHeader()
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 @@ sal_Bool EnhWMFReader::ReadHeader()
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/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 0adca65..fcfd07f 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -350,6 +350,20 @@ Color WinMtf::ReadColor()
//---
//---
+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())*UNDOCUMENTED_WIN_RCL_RELATION-mrclFrame.Left(),(rPt.Y())*UNDOCUMENTED_WIN_RCL_RELATION-mrclFrame.Top());
+}
+}
+
+//---
+
Point WinMtfOutput::ImplMap( const Point rPt )
{
if ( mnWinExtX mnWinExtY )
@@ -368,8 +382,8 @@ Point WinMtfOutput::ImplMap( const Point rPt )
fX2 -= mnWinOrgX;
fY2 -= mnWinOrgY;
if( mnDevWidth != 1 || mnDevHeight != 1 ) {
-fX2 *= 2540.0/mnUnitsPerInch;
-fY2 *= 2540.0/mnUnitsPerInch;
+fX2 *=
HUNDREDTH_MILLIMETERS_PER_MILLIINCH*1000/mnUnitsPerInch;
+fY2 *=
HUNDREDTH_MILLIMETERS_PER_MILLIINCH*1000/mnUnitsPerInch
[Libreoffice-commits] core.git: sc/source sd/source sw/source
sc/source/ui/drawfunc/fusel.cxx | 28 ++
sc/source/ui/drawfunc/futext.cxx | 41 ---
sd/source/ui/func/fusel.cxx |5 +---
sd/source/ui/func/futext.cxx | 22
sw/source/ui/docvw/edtwin.cxx|8 +++
5 files changed, 77 insertions(+), 27 deletions(-)
New commits:
commit e80a8b6f14fac6bb6cc7ea55b118f95472d5b654
Author: Lennard Wasserthal wassert...@nefkom.net
Date: Sat Feb 9 14:31:21 2013 +0100
fdo#55430 switches off text mode when clicking an other object.
This patch complements 85ea03ae536831649b104694d08dced4d4c8663f (and
6fbba11da54b52554941f00b07e42cc5d7a1643c, which didn't work 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 ./sd/ text routine AT ALL, which also
caused bug 37482,
which is resolved differently from now on)
(Creating text fields doesn't belong into the ./sc/ shape text routine
either, and if this executed, it causes funny glitches)
Known issues: text mode stays on when you use drag'n drop (the one WITH
waiting, to move to other applications etc).
Change-Id: I3c8cdedbfae58165ebeda5887c1b6573832eb495
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Reviewed-on: https://gerrit.libreoffice.org/1344
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 4968f15..a3568b0 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -53,6 +53,8 @@
// Maximal erlaubte Mausbewegung um noch DragDrop zu starten
//! fusel,fuconstr,futext - zusammenfassen!
#define SC_MAXDRAGMOVE 3
+// Min necessary mouse motion for normal dragging
+#define SC_MINDRAGMOVE 2
// ---
@@ -381,11 +383,14 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent
rMEvt)
sal_Bool bReturn = FuDraw::MouseButtonUp(rMEvt);
sal_Bool bOle = pViewShell-GetViewFrame()-GetFrame().IsInPlace();
+SdrObject* pObj = NULL;
+SdrPageView* pPV = NULL;
if (aDragTimer.IsActive() )
{
aDragTimer.Stop();
}
+sal_uInt16 nDrgLog = sal_uInt16 (
pWindow-PixelToLogic(Size(SC_MINDRAGMOVE,0)).Width() );
Point aPnt( pWindow-PixelToLogic( rMEvt.GetPosPixel() ) );
bool bCopy = false;
@@ -416,7 +421,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent rMEvt)
for ( sal_uLong i = 0; i nMarkCount; ++i )
{
SdrMark* pMark = rSdrMarkList.GetMark( i );
-SdrObject* pObj = ( pMark ? pMark-GetMarkedSdrObj() :
NULL );
+pObj = ( pMark ? pMark-GetMarkedSdrObj() : NULL );
if ( pObj )
{
ScChartHelper::AddRangesIfProtectedChart(
aProtectedChartRangesVector, pDocument, pObj );
@@ -426,6 +431,21 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent
rMEvt)
bCopy = true;
}
+if (!rMEvt.IsShift() !rMEvt.IsMod1() !rMEvt.IsMod2()
+Abs(aPnt.X() - aMDPos.X()) nDrgLog
+Abs(aPnt.Y() - aMDPos.Y()) nDrgLog)
+{
+/*
+* If a user wants to click on an object in front of a marked
+* one, he releases the mouse button immediately
+**/
+if (pView-PickObj(aMDPos, pView-getHitTolLog(), pObj, pPV,
SDRSEARCH_ALSOONMASTER | SDRSEARCH_BEFOREMARK))
+{
+pView-UnmarkAllObj();
+pView-MarkObj(pObj,pPV,false,false);
+return (sal_True);
+}
+}
pView-EndDragObj( rMEvt.IsMod1() );
pView-ForceMarkedToAnotherPage();
@@ -433,7 +453,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent rMEvt)
if (rMarkList.GetMarkCount() == 1)
{
SdrMark* pMark = rMarkList.GetMark(0);
- SdrObject* pObj = pMark-GetMarkedSdrObj();
+ pObj = pMark-GetMarkedSdrObj();
FuPoor* pPoor =
pViewShell-GetViewData()-GetView()-GetDrawFuncPtr();
FuText* pText = static_castFuText*(pPoor);
pText-StopDragMode(pObj );
@@ -458,7 +478,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent rMEvt)
bool bFound = false;
for( sal_uLong nIdx = 0; !bFound (nIdx nCount);
++nIdx )
{
-SdrObject* pObj
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 wassert...@nefkom.net
---
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;
+}
+
+//---
+
+Polygon
[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 wassert...@nefkom.net --- 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 wassert...@nefkom.net ___ 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 wassert...@nefkom.net
---
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 sfx2/request.hxx
#include sfx2/bindings.hxx
#include tools/urlobj.hxx
+#include cliputil.hxx
#include svx/svxdlg.hxx
#include svx/dialogs.hrc
#include svx/fmglob.hxx
@@ -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 wassert...@nefkom.net
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#56976 fixes up Arrow import bug
().getTokenFromUnicode( OUString(
RTL_CONSTASCII_USTRINGPARAM( upArrow ) ) ) ] = new ShapeCupArrow();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString(
RTL_CONSTASCII_USTRINGPARAM( curvedDownArrow ) ) ) ] = new
ShapeCcurvedDownArrow();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString(
RTL_CONSTASCII_USTRINGPARAM( actionButtonReturn ) ) ) ] = new
ShapeCactionButtonReturn();
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString(
RTL_CONSTASCII_USTRINGPARAM( flowChartInputOutput ) ) ) ] = new
ShapeCflowChartInputOutput();
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 87b8e55..1a4d8f1 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -439,6 +439,7 @@
{ ooxml-flowChartMerge, flowChartMerge },
{ ooxml-line, line },
{ ooxml-downArrow, downArrow },
+{ ooxml-upArrow, upArrow },
{ ooxml-curvedDownArrow, curvedDownArrow },
{ ooxml-actionButtonReturn, actionButtonReturn },
{ ooxml-flowChartInputOutput, flowChartInputOutput },
--
To view, visit https://gerrit.libreoffice.org/1492
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b9ce3ae1aef7894ab04b9857e90831d715ec1d5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[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 wassert...@nefkom.net --- 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 wassert...@nefkom.net ___ 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 wassert...@nefkom.net --- 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 wassert...@nefkom.net ___ 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 wassert...@nefkom.net
---
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 wassert...@nefkom.net
___
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 wassert...@nefkom.net --- 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 wassert...@nefkom.net ___ 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 wassert...@nefkom.net --- 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 wassert...@nefkom.net ___ 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 wassert...@nefkom.net Gerrit-Reviewer: Lennard Wasserthal wassert...@nefkom.net ___ 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 wassert...@nefkom.net Gerrit-Reviewer: Lennard Wasserthal wassert...@nefkom.net ___ 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 wassert...@nefkom.net --- 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 wassert...@nefkom.net ___ 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 wassert...@nefkom.net --- 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 wassert...@nefkom.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License Statement!
I HAD put such a blanket statement in the commit message of my bug fix (gerrit) submission. But, since I did it wrongly before, here again: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license - Lennard Wasserthal Greetings - 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 wassert...@nefkom.net --- 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 wassert...@nefkom.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#35079: EDITING: Drawing element completely in mouse selection frame not selected
This is the second attempt to fix this. The last one prevented the presentation from working, because all hiddengeometries didn't exhibit BoundRects. I am sorry for that. This time, I just deleted the disturbing object from all customshapes. I found it nowhere missing. greetings - Lennard Wasserthal Disclaimer: I put all my contributions to LibreOffice under the GNU Lesser General Public License (LGPLv3). From 2dcf69e228ed36ccaf8730eff6e92fa0c96abf91 Mon Sep 17 00:00:00 2001 From: Lennard lennard@Virtual.(none) Date: Sun, 2 Sep 2012 10:49:56 +0200 Subject: [PATCH] next attempt to fix bug #35079. Removes the hidden frame. That frame really doesn't seem to be needed, not even for exporting, though. Change-Id: I3e506668fe775278400290d5bdc483c41ccabba9 Signed-off-by: Lennard Wasserthal wassert...@nefkom.net --- .../sdr/contact/viewcontactofsdrobjcustomshape.cxx |4 1 file changed, 4 deletions(-) diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 669403c..d5bd015 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -235,10 +235,6 @@ namespace sdr aObjectBound.Left(), aObjectBound.Top(), aObjectBound.Right(), aObjectBound.Bottom()); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, -drawinglayer::primitive2d::createHiddenGeometryPrimitives2D( -false, aObjectRange)); - return xRetval; } } // end of namespace contact -- 1.7.9.5 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
GPL, Of course.
I hereby publish the contents of my patches under the same conditions as the respective LibreOffice Licenses are published (Where was i supposed to have put this information?) I am very sorry that I didn't implement the correct name of that number. This could have caused severe trouble if the numbers were changed: 8( I hope you found it from my text in the bug discussions. thanks for implementing! - Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Licensing 35079
So to make it clear: I publish my patch [PATCH] fdo#35079: EDITING: Drawing element completely in mouse selection frame not selected. Drawing: Fixed Custom Shape Frame-Selection Bounding box bug. under the terms of the LGPLv3+ and MPL dual license. An next time I will write it directly to avoid unnecessary mails. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
