[Libreoffice-commits] core.git: 2 commits - officecfg/registry sd/source sw/inc sw/sdi sw/source
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5
sd/source/ui/app/sdxfer.cxx | 11 +
sw/inc/PostItMgr.hxx |5
sw/inc/cmdid.h |2
sw/inc/swcommands.h |1
sw/sdi/_annotsh.sdi |6
sw/sdi/_textsh.sdi |5
sw/sdi/swriter.sdi | 24 +++
sw/source/core/uibase/docvw/AnnotationMenuButton.cxx |2
sw/source/core/uibase/docvw/PostItMgr.cxx| 77
+-
sw/source/core/uibase/docvw/SidebarWin.cxx |1
sw/source/core/uibase/docvw/annotation.hrc |1
sw/source/core/uibase/inc/annotsh.hxx|2
sw/source/core/uibase/shells/annotsh.cxx | 17 +-
sw/source/core/uibase/shells/textfld.cxx | 14 +
sw/source/ui/app/mn.src |6
sw/source/ui/docvw/annotation.src|5
17 files changed, 176 insertions(+), 8 deletions(-)
New commits:
commit e735b48e2107a0ee1a9553a6bc4d09d1d176b370
Author: Armin Le Grand a...@apache.org
Date: Tue Apr 22 11:45:25 2014 +
Resolves: #i63399# add to clipboard as URL only when...
no fill and no line style, just a simple URL
(cherry picked from commit a91b5943b2c971ff1e69f5c2da45b8a647562676)
Change-Id: Ic8bd02c81663575355a0ca79e4987b5ef0e4a445
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index c0b58a8..d155f5c 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -225,7 +225,16 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
{
const SvxURLField* pURL = (SvxURLField*) pData;
-mpBookmark = new INetBookmark( pURL-GetURL(),
pURL-GetRepresentation() );
+// #i63399# This special code identifies TextFrames
which have just an URL
+// as content and directly add this to the clipboard,
probably to avoid adding
+// an unnecessary DrawObject to the target where paste
may take place. This is
+// wanted only for SdrObjects with no fill and no
line, else it is necessary to
+// use the whole SdrObect. Test here for
Line/FillStyle and take shortcut only
+// when both are unused
+if(!pObj-HasFillStyle() !pObj-HasLineStyle())
+{
+mpBookmark = new INetBookmark( pURL-GetURL(),
pURL-GetRepresentation() );
+}
}
}
}
commit ebb728c9c01b5e86926381fa816cf69cb3eb1e37
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 17:06:26 2014 +0100
add a 'format all comments' feature
Change-Id: Ie9530f0f58b38d014beda60b9efba3ce93fe5c0e
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 548f9aa..ad9275b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5308,6 +5308,11 @@
value xml:lang=en-USDelete All Comments/value
/prop
/node
+ node oor:name=.uno:FormatAllNotes oor:op=replace
+prop oor:name=Label oor:type=xs:string
+ value xml:lang=en-USFormat All Comments/value
+/prop
+ /node
node oor:name=.uno:DeleteAuthor oor:op=replace
prop oor:name=Label oor:type=xs:string
value xml:lang=en-USDelete All Comments by This Author/value
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 4f99419..438cffa 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -44,6 +44,8 @@ class SfxBroadcaster;
class SfxHint;
class SwEditWin;
class Color;
+class SfxItemPool;
+class SfxItemSet;
class SvxSearchItem;
class SvxLanguageItem;
namespace sw { namespace annotation {
@@ -218,6 +220,9 @@ class SwPostItMgr: public SfxListener
void Delete(const OUString aAuthor);
void Delete();
+void ExecuteFormatAllDialog(SwView rView);
+void FormatAll(const SfxItemSet rNewAttr);
+
void Hide( const OUString rAuthor );
void Hide();
void Show();
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 2e78df9..d8fdc2e 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -783,7 +783,7 @@ included
[Libreoffice-commits] core.git: 2 commits - officecfg/registry sd/source
officecfg/registry/cppheader.xsl | 12 ++--
sd/source/ui/view/drviews7.cxx | 26 ++
2 files changed, 24 insertions(+), 14 deletions(-)
New commits:
commit 13cb088a2d8902822e3eb5607ba4cac81ad4d2f2
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 13 14:35:40 2013 +
sdremote: hide TCP/IP server selection dialog menu item
Now shown only in experimental mode (ie. when TCP/IP is enabled)
to reduce user-confusion. Said dialog is not needed for bluetooth.
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index f2d69be..f077d30 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -26,6 +26,7 @@
#include editeng/eeitem.hxx
#include editeng/flditem.hxx
#include editeng/outlobj.hxx
+#include officecfg/Office/Common.hxx
#include officecfg/Office/Impress.hxx
#include svx/svxids.hrc
#include svx/svdpagv.hxx
@@ -51,7 +52,6 @@
#include comphelper/processfactory.hxx
#include sfx2/request.hxx
-
#include svx/pfiledlg.hxx
#include svx/grafctrl.hxx
#include svtools/cliplistener.hxx
@@ -996,15 +996,25 @@ void DrawViewShell::GetMenuState( SfxItemSet rSet )
rSet.DisableItem(SID_ZOOM_PREV);
}
-bool bDisableSdremoteForGood = false;
+if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REMOTE_DLG ) )
+{
+
+bool bDisableSdremoteForGood = false;
#ifndef ENABLE_SDREMOTE
-bDisableSdremoteForGood = true;
+bDisableSdremoteForGood = true;
#endif
-uno::Reference uno::XComponentContext xContext =
comphelper::getProcessComponentContext();
-if ( bDisableSdremoteForGood || ( xContext.is()
!officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) ) )
-{
-rSet.ClearItem(SID_REMOTE_DLG);
-rSet.DisableItem(SID_REMOTE_DLG);
+uno::Reference uno::XComponentContext xContext =
comphelper::getProcessComponentContext();
+if ( xContext.is() )
+bDisableSdremoteForGood |= ! (
officecfg::Office::Common::Misc::ExperimentalMode::get( xContext )
+
+
officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) );
+
+// This dialog is only useful for TCP/IP remote control
+// which is unusual, under-tested and a security issue.
+if ( bDisableSdremoteForGood )
+{
+rSet.Put(SfxVisibilityItem(SID_REMOTE_DLG, false));
+}
}
// EditText aktiv
commit 90d42440eeaf7994f3ad57ebfdc8edb129c8faff
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 13 14:24:26 2013 +
cleanup generated config includes to make them more readable.
diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl
index 372876e..9bdce8e 100644
--- a/officecfg/registry/cppheader.xsl
+++ b/officecfg/registry/cppheader.xsl
@@ -149,11 +149,11 @@
xsl:value-of select=$name/
xsl:textgt; {#xA;/xsl:text
xsl:textstatic rtl::OUString path() { return rtl::OUString(!--
- --RTL_CONSTASCII_USTRINGPARAM(/xsl:text
+ --/xsl:text
xsl:value-of select=$path/
xsl:text//xsl:text
xsl:value-of select=@oor:name/
- xsl:text)); }#xA;/xsl:text
+ xsl:text); }#xA;/xsl:text
xsl:text#xA;/xsl:text
xsl:apply-templates select=group|set|prop
xsl:with-param name=path
@@ -183,11 +183,11 @@
xsl:value-of select=$name/
xsl:textgt; {#xA;/xsl:text
xsl:textstatic rtl::OUString path() { return rtl::OUString(!--
---RTL_CONSTASCII_USTRINGPARAM(/xsl:text
+--/xsl:text
xsl:value-of select=$path/
xsl:text//xsl:text
xsl:value-of select=@oor:name/
-xsl:text)); }#xA;/xsl:text
+xsl:text); }#xA;/xsl:text
xsl:textprivate:#xA;/xsl:text
xsl:text/xsl:text
xsl:value-of select=$name/
@@ -272,11 +272,11 @@
/xsl:if
xsl:textgt; {#xA;/xsl:text
xsl:textstatic rtl::OUString path() { return rtl::OUString(!--
---RTL_CONSTASCII_USTRINGPARAM(/xsl:text
+--/xsl:text
xsl:value-of select=$path/
xsl:text//xsl:text
xsl:value-of select=@oor:name/
-xsl:text)); }#xA;/xsl:text
+xsl:text); }#xA;/xsl:text
xsl:textprivate:#xA;/xsl:text
xsl:text/xsl:text
xsl:value-of select=$name/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
