[Libreoffice-commits] .: 10 commits - sw/inc sw/sdi sw/source
Thorsten Behrens
thorsten at kemper.freedesktop.org
Fri Dec 3 07:37:32 PST 2010
sw/inc/cmdid.h | 2 +
sw/inc/crsrsh.hxx | 2 -
sw/sdi/_grfsh.sdi | 5 +++
sw/sdi/swriter.sdi | 27 +++++++++++++++++++
sw/source/core/table/swtable.cxx | 2 -
sw/source/ui/app/mn.src | 8 +++++
sw/source/ui/dbui/dbinsdlg.cxx | 2 -
sw/source/ui/dbui/mmoutputpage.cxx | 2 -
sw/source/ui/dialog/swdlgfact.cxx | 2 -
sw/source/ui/docvw/makefile.mk | 1
sw/source/ui/docvw/romenu.cxx | 40 ++++++++++++++---------------
sw/source/ui/docvw/romenu.hxx | 2 +
sw/source/ui/inc/extedit.hxx | 50 +++++++++++++++++++++++++++++++++++++
sw/source/ui/shells/grfsh.cxx | 22 +++++++++++++++-
14 files changed, 141 insertions(+), 26 deletions(-)
New commits:
commit 879195e858aa1ac1d902dc8a218189d84c1d1226
Author: Surendran Mahendran <surenspost at gmail.com>
Date: Fri Dec 3 16:18:08 2010 +0100
First cuts for edit with external tool method
Define the EditWithExternalTool method and add it to the makefile to get it
built as well. Basic working model of external edit application.
This should work fine in all platforms given that I am using SystemShellExecute
ReRead method does an automatic refresh of the Shell
diff --git a/sw/source/ui/docvw/makefile.mk b/sw/source/ui/docvw/makefile.mk
index a2914b2..5e9f739 100644
--- a/sw/source/ui/docvw/makefile.mk
+++ b/sw/source/ui/docvw/makefile.mk
@@ -51,6 +51,7 @@ SLOFILES = \
$(SLO)$/edtwin2.obj \
$(SLO)$/edtwin3.obj \
$(SLO)$/romenu.obj \
+ $(SLO)$/extedit.obj \
$(SLO)$/srcedtw.obj \
$(SLO)$/PostItMgr.obj \
$(SLO)$/frmsidebarwincontainer.obj \
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index aba455d..50d8771 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -77,6 +77,24 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::sfx2;
+void GetPreferedExtension( String &rExt, const Graphic &rGrf )
+{
+ // dann ggfs. ueber die native-Info der Grafik den "besten"
+ // Filter vorschlagen
+ const sal_Char* pExt = "png";
+ switch( const_cast<Graphic&>(rGrf).GetLink().GetType() )
+ {
+ case GFX_LINK_TYPE_NATIVE_GIF: pExt = "gif"; break;
+ case GFX_LINK_TYPE_NATIVE_TIF: pExt = "tif"; break;
+ case GFX_LINK_TYPE_NATIVE_WMF: pExt = "wmf"; break;
+ case GFX_LINK_TYPE_NATIVE_MET: pExt = "met"; break;
+ case GFX_LINK_TYPE_NATIVE_PCT: pExt = "pct"; break;
+ case GFX_LINK_TYPE_NATIVE_JPG: pExt = "jpg"; break;
+ default:; //prevent warning
+ }
+ rExt.AssignAscii( pExt );
+}
+
SwReadOnlyPopup::~SwReadOnlyPopup()
{
String *pDel = (String*)aThemeList.First();
@@ -427,7 +445,7 @@ String ExportGraphic( const Graphic &rGraphic, const String &rGrfName )
String aExt( aURL.GetExtension() );
if( !aExt.Len() )
- lcl_GetPreferedExtension( aExt, rGraphic );
+ GetPreferedExtension( aExt, rGraphic );
aExt.ToLowerAscii();
USHORT nDfltFilter = USHRT_MAX;
@@ -443,7 +461,7 @@ String ExportGraphic( const Graphic &rGraphic, const String &rGrfName )
if ( USHRT_MAX == nDfltFilter )
{
//"falsche" Extension?
- lcl_GetPreferedExtension( aExt, rGraphic );
+ GetPreferedExtension( aExt, rGraphic );
for ( USHORT i = 0; i < nCount; ++i )
if ( aExt == rGF.GetExportFormatShortName( i ).ToLowerAscii() )
{
diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx
index 71a02ae..6061504 100644
--- a/sw/source/ui/docvw/romenu.hxx
+++ b/sw/source/ui/docvw/romenu.hxx
@@ -68,23 +68,7 @@ public:
void Execute( Window* pWin, USHORT nId );
};
-static void lcl_GetPreferedExtension( String &rExt, const Graphic &rGrf )
-{
- // dann ggfs. ueber die native-Info der Grafik den "besten"
- // Filter vorschlagen
- const sal_Char* pExt = "png";
- switch( const_cast<Graphic&>(rGrf).GetLink().GetType() )
- {
- case GFX_LINK_TYPE_NATIVE_GIF: pExt = "gif"; break;
- case GFX_LINK_TYPE_NATIVE_TIF: pExt = "tif"; break;
- case GFX_LINK_TYPE_NATIVE_WMF: pExt = "wmf"; break;
- case GFX_LINK_TYPE_NATIVE_MET: pExt = "met"; break;
- case GFX_LINK_TYPE_NATIVE_PCT: pExt = "pct"; break;
- case GFX_LINK_TYPE_NATIVE_JPG: pExt = "jpg"; break;
- default:; //prevent warning
- }
- rExt.AssignAscii( pExt );
-}
+void GetPreferedExtension( String &rExt, const Graphic &rGrf );
#endif
diff --git a/sw/source/ui/inc/extedit.hxx b/sw/source/ui/inc/extedit.hxx
index 38db4f5..d013890 100644
--- a/sw/source/ui/inc/extedit.hxx
+++ b/sw/source/ui/inc/extedit.hxx
@@ -28,11 +28,23 @@
#include <osl/process.h>
#include <vcl/graph.hxx>
#include <svtools/grfmgr.hxx>
+#include <wrtsh.hxx>
+#include <vcl/timer.hxx>
-class ExternalProcessClass_Impl;
-struct ThreadData;
-struct ExternalEvent;
+struct Data
+{
+ GraphicObject *pGraphicObject;
+ rtl::OUString fileName;
+ SwWrtShell *rSh ;
+};
-void EditWithExternalTool(GraphicObject *pGraphic);
+class ExternalProcessClass_Impl
+{
+ public:
+ DECL_LINK( CloseEvent, void *pEvent );
+ DECL_LINK( StartListeningEvent, void *pEvent );
+};
+
+void EditWithExternalTool(GraphicObject *pGraphic, SwWrtShell *rSh);
#endif
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 1d1f555..7464b22 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -122,7 +122,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
GraphicObject *pGraphicObject = (GraphicObject *) rSh.GetGraphicObj();
if(0 != pGraphicObject)
{
- EditWithExternalTool(pGraphicObject);
+ EditWithExternalTool(pGraphicObject, &rSh);
}
}
break;
commit d1f97894f43239ce82e431da766d5b3768f21cd5
Author: Surendran Mahendran <surenspost at gmail.com>
Date: Thu Dec 2 01:52:38 2010 +0100
Handle Click of External Edit functionality
By adding the external method to the specific FN_EXTERNAL_EDIT identifier
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 8ebea83..1d1f555 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -76,7 +76,7 @@
#include <swwait.hxx>
#include <shells.hrc>
#include <popup.hrc>
-
+#include <extedit.hxx>
#define SwGrfShell
#include <sfx2/msg.hxx>
#include "swslots.hxx"
@@ -114,6 +114,19 @@ void SwGrfShell::Execute(SfxRequest &rReq)
}
}
break;
+ case FN_EXTERNAL_EDIT:
+ {
+ /* When the graphic is selected to be opened via some external tool
+ * for advanced editing
+ */
+ GraphicObject *pGraphicObject = (GraphicObject *) rSh.GetGraphicObj();
+ if(0 != pGraphicObject)
+ {
+ EditWithExternalTool(pGraphicObject);
+ }
+ }
+ break;
+
case SID_INSERT_GRAPHIC:
case FN_FORMAT_GRAFIC_DLG:
{
@@ -533,6 +546,13 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
if( rSh.GetGraphicType() == GRAPHIC_NONE )
bDisable = sal_True;
break;
+ /*
+ * If the Graphic is None type it should be externally editable
+ */
+ case FN_EXTERNAL_EDIT:
+ if( rSh.GetGraphicType() == GRAPHIC_NONE )
+ bDisable = sal_True;
+ break;
case SID_COLOR_SETTINGS:
{
if ( bParentCntProt || !bIsGrfCntnt )
commit 457c963d4342fc0a8003cb9eecca7e7780f8380d
Author: Surendran Mahendran <surenspost at gmail.com>
Date: Thu Dec 2 01:49:51 2010 +0100
Header file for external edit tool functionality
Has the method that is invoked when edit with external tool is called
diff --git a/sw/source/ui/inc/extedit.hxx b/sw/source/ui/inc/extedit.hxx
new file mode 100644
index 0000000..38db4f5
--- /dev/null
+++ b/sw/source/ui/inc/extedit.hxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * [ Surendran Mahendran <surenspost at gmail.com>]
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef _EXTEDIT_HXX
+#define _EXTEDIT_HXX
+
+#include <osl/file.hxx>
+#include <osl/process.h>
+#include <vcl/graph.hxx>
+#include <svtools/grfmgr.hxx>
+
+class ExternalProcessClass_Impl;
+struct ThreadData;
+struct ExternalEvent;
+
+void EditWithExternalTool(GraphicObject *pGraphic);
+
+#endif
commit 918646811be1281bf9402ee9391d7e840b22de2c
Author: Surendran Mahendran <surenspost at gmail.com>
Date: Thu Dec 2 01:46:01 2010 +0100
Moved a functionality to a header file
Needed the lcl_getPreferredExtension elsewhere, so moved it to hxx.
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 8b543bc..aba455d 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -378,24 +378,6 @@ void SwReadOnlyPopup::Execute( Window* pWin, USHORT nId )
pClipCntnr->CopyToClipboard( pWin );
}
}
-static void lcl_GetPreferedExtension( String &rExt, const Graphic &rGrf )
-{
- // dann ggfs. ueber die native-Info der Grafik den "besten"
- // Filter vorschlagen
- const sal_Char* pExt = "png";
- switch( const_cast<Graphic&>(rGrf).GetLink().GetType() )
- {
- case GFX_LINK_TYPE_NATIVE_GIF: pExt = "gif"; break;
- case GFX_LINK_TYPE_NATIVE_TIF: pExt = "tif"; break;
- case GFX_LINK_TYPE_NATIVE_WMF: pExt = "wmf"; break;
- case GFX_LINK_TYPE_NATIVE_MET: pExt = "met"; break;
- case GFX_LINK_TYPE_NATIVE_PCT: pExt = "pct"; break;
- case GFX_LINK_TYPE_NATIVE_JPG: pExt = "jpg"; break;
- default:; //prevent warning
- }
- rExt.AssignAscii( pExt );
-}
-
String SwReadOnlyPopup::SaveGraphic( USHORT nId )
{
diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx
index 557b88d..71a02ae 100644
--- a/sw/source/ui/docvw/romenu.hxx
+++ b/sw/source/ui/docvw/romenu.hxx
@@ -32,6 +32,7 @@
#include <vcl/graph.hxx>
#include <tools/list.hxx>
#include <vcl/menu.hxx>
+#include <svl/stritem.hxx>
class SwView;
class SfxDispatcher;
@@ -67,6 +68,23 @@ public:
void Execute( Window* pWin, USHORT nId );
};
+static void lcl_GetPreferedExtension( String &rExt, const Graphic &rGrf )
+{
+ // dann ggfs. ueber die native-Info der Grafik den "besten"
+ // Filter vorschlagen
+ const sal_Char* pExt = "png";
+ switch( const_cast<Graphic&>(rGrf).GetLink().GetType() )
+ {
+ case GFX_LINK_TYPE_NATIVE_GIF: pExt = "gif"; break;
+ case GFX_LINK_TYPE_NATIVE_TIF: pExt = "tif"; break;
+ case GFX_LINK_TYPE_NATIVE_WMF: pExt = "wmf"; break;
+ case GFX_LINK_TYPE_NATIVE_MET: pExt = "met"; break;
+ case GFX_LINK_TYPE_NATIVE_PCT: pExt = "pct"; break;
+ case GFX_LINK_TYPE_NATIVE_JPG: pExt = "jpg"; break;
+ default:; //prevent warning
+ }
+ rExt.AssignAscii( pExt );
+}
#endif
commit 1a48fadfd622edc727c48c6ccfedeb73908b951c
Author: Surendran Mahendran <surenspost at gmail.com>
Date: Thu Dec 2 01:45:15 2010 +0100
Adding "Edit via External Tool" to Graphic Popup
1) add unique identifier to cmdid.h
2) add ExecMethod and StateMethod to _grfsh.sdi
3) add additional details for the identifier in swriter.sdi
4) add the item to the popup menu in mn.src
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index beb4e8a..08d928e 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -858,6 +858,8 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_UNO_TABLE_NAME (FN_EXTRA2 + 111)
#define FN_UNO_META (FN_EXTRA2 + 112)
#define FN_UNO_NESTED_TEXT_CONTENT (FN_EXTRA2 + 113)
+/* Edit Graphic with External Tool */
+#define FN_EXTERNAL_EDIT (FN_EXTRA2 + 114)
/*------------------------------------------------ --------------------
Area: Help
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 161db94..7cd69df 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -58,6 +58,11 @@ interface BaseTextGraphic
StateMethod = GetAttrState ;
]
+ FN_EXTERNAL_EDIT
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetAttrState ;
+ ]
SID_INSERT_GRAPHIC // zeigt auf FN_FORMAT_GRAFIC_DLG
[
ExecMethod = Execute ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index c2fcc53..081681e 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3510,6 +3510,33 @@ SfxVoidItem SaveGraphic FN_SAVE_GRAPHIC
GroupId = GID_GRAPHIC;
]
+//------------------------------------------------------------------------
+SfxVoidItem ExternalEdit FN_EXTERNAL_EDIT
+()
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_GRAPHIC;
+]
+//------------------------------------------------------------------------
+
+
//--------------------------------------------------------------------------
SfxVoidItem Grow FN_GROW_FONT_SIZE
()
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index f57afa6..a252388 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -941,6 +941,14 @@ Menu MN_GRF_POPUPMENU
Text [ en-US ] = "Save Graphics..." ;
};
MN_FRM_CAPTION_ITEM
+ SEPARATOR;
+ MenuItem
+ {
+ Identifier = FN_EXTERNAL_EDIT ;
+ HelpID = FN_EXTERNAL_EDIT ;
+ Text [ en-US ] = "Edit with External Tool...";
+ };
+ SEPARATOR;
MenuItem
{
ITEM_EDIT_IMAP
commit e288d15b2127c5fe50a9fd9f23da77a3d5692dd9
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Nov 29 14:01:33 2010 +0100
n#636367: Table alignment set to "From Left" when moving the right
When moving the right end of a table, the table alignment came to
Manual but this caused size weirdness when switching from web to print
layout. Using the "From left" option for the alignment keeps the size.
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index f7c7b79..a28dd70 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -983,7 +983,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
else if(!bLeftDist && rNew.GetRight() + nShRight < rNew.GetRightMax())
aOri.SetHoriOrient( text::HoriOrientation::LEFT );
else
- aOri.SetHoriOrient( text::HoriOrientation::NONE );
+ aOri.SetHoriOrient( text::HoriOrientation::LEFT_AND_WIDTH );
}
pFmt->SetFmtAttr( aOri );
}
commit c6d89e9c0f73d63ad283db756eb21f1710ff1354
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Nov 7 22:04:15 2010 +0200
Fix compilation error caused by DBG_UTIL vs. OSL_DEBUG_LEVEL mixup
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index d4f1c6a..65da399 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -109,7 +109,7 @@ struct SwContentAtPos
SW_CONTENT_CHECK = 0x0400,
SW_SMARTTAG = 0x0800,
SW_FORMCTRL = 0x1000
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DBG_UTIL
,SW_CURR_ATTRS = 0x4000 // only for debugging
,SW_TABLEBOXVALUE = 0x8000 // only for debugging
#endif
commit 21ced656bb85e89b939c782c0472bd81d4da07a2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Nov 7 21:40:31 2010 +0200
Fix compilation error caused by DBG_UTIL vs. OSL_DEBUG_LEVEL mixup
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 1319a7d..8ec3942 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -583,7 +583,7 @@ long AbstractMailMergeWizard_Impl::GetResult()
return pDlg->GetResult();
}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DBG_UTIL
IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, pDialog )
#else
IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, EMPTYARG )
commit 81f00cd8c3bd78f18f040ea16cd70e95025c313e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Nov 7 18:10:08 2010 +0200
Fix compilation error caused by DBG_UTIL vs. OSL_DEBUG_LEVEL mixup
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 9b64fe1..0d9b4be 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1205,7 +1205,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
}
xTempDocShell->DoClose();
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DBG_UTIL
sal_Int32 nTarget =
rConfigItem.MoveResultSet(rInfo.nDBRow);
OSL_ENSURE( nTarget == rInfo.nDBRow, "row of current document could not be selected");
commit 362052bfef11763ee21ee15c8551ec76a5027385
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sun Nov 7 18:08:11 2010 +0200
Fix compilation error caused by DBG_UTIL vs. OSL_DEBUG_LEVEL mixup
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index f766b41..49be8b5 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1180,7 +1180,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
}
}
catch(Exception&
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DBG_UTIL
aExcept
#endif
)
More information about the Libreoffice-commits
mailing list