[Libreoffice-commits] .: sfx2/inc sfx2/source

2013-01-31 Thread Cédric Bosdonnat 
 sfx2/inc/sfx2/sfx.hrc|5 +
 sfx2/inc/templatedlg.hxx |2 ++
 sfx2/source/appl/sfx.src |   20 
 sfx2/source/control/templateview.cxx |6 ++
 sfx2/source/doc/templatedlg.cxx  |   25 +
 5 files changed, 58 insertions(+)

New commits:
commit af331776895c1c3d036040599501d3f08a4d5562
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Jan 31 16:36:52 2013 +0100

Template Manager: show some icons if there is no thumbnail

diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 500063c..5d99d61 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -169,6 +169,11 @@
 #define BT_CHECKOUT (RID_SFX_START+126)
 #define STR_ACCTITLE_PRODUCTIVITYTOOLS  (RID_SFX_START+157)
 
+#define SFX_THUMBNAIL_TEXT  (RID_SFX_START+158)
+#define SFX_THUMBNAIL_SHEET (RID_SFX_START+159)
+#define SFX_THUMBNAIL_PRESENTATION  (RID_SFX_START+160)
+#define SFX_THUMBNAIL_DRAWING   (RID_SFX_START+161)
+
 //=
 
 // group ids
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 4a18ab2..1cc9ae5 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -50,6 +50,8 @@ public:
 
 DECL_LINK(ActivatePageHdl, void*);
 
+static BitmapEx getDefaultThumbnail( const rtl::OUString rPath );
+
 private:
 
 virtual void MouseButtonDown( const MouseEvent rMEvt );
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 1103841..bffec2b 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -37,3 +37,23 @@ String STR_PASSWD
 {
 Text [ en-US ] = Password ;
 };
+
+Bitmap ( SFX_THUMBNAIL_TEXT )
+{
+File = odt_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_SHEET )
+{
+File = ods_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_PRESENTATION )
+{
+File = odp_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_DRAWING )
+{
+File = odg_48_8.png;
+};
diff --git a/sfx2/source/control/templateview.cxx 
b/sfx2/source/control/templateview.cxx
index 01f9206..4a44ea0 100644
--- a/sfx2/source/control/templateview.cxx
+++ b/sfx2/source/control/templateview.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include templatedlg.hxx
 #include sfx2/templateview.hxx
 
 #include basegfx/matrix/b2dhommatrixtools.hxx
@@ -63,6 +64,11 @@ void TemplateView::InsertItems (const 
std::vectorTemplateItemProperties rTemp
 pItem-maTitle = pCur-aName;
 pItem-setPath(pCur-aPath);
 pItem-maPreview1 = pCur-aThumbnail;
+if ( pCur-aThumbnail.IsEmpty() )
+{
+// Use the default thumbnail if we have nothing else
+pItem-maPreview1 = SfxTemplateManagerDlg::getDefaultThumbnail( 
pItem-getPath() );
+}
 pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 
 mItemList.push_back(pItem);
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index d3721ab..8bb8035 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1534,6 +1534,31 @@ void SfxTemplateManagerDlg::syncRepositories() const
 }
 }
 
+BitmapEx SfxTemplateManagerDlg::getDefaultThumbnail( const OUString rPath )
+{
+INetURLObject aUrl(rPath);
+OUString aExt = aUrl.getExtension();
+
+BitmapEx aImg;
+if ( aExt == ott || aExt == stw || aExt == oth || aExt == dot || 
aExt == dotx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_TEXT ) );
+}
+else if ( aExt == ots || aExt == stc || aExt == xlt || aExt == 
xltm || aExt == xltx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_SHEET ) );
+}
+else if ( aExt == otp || aExt == sti || aExt == pot || aExt == 
potm || aExt == potx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_PRESENTATION ) );
+}
+else if ( aExt == otg || aExt == std )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_DRAWING ) );
+}
+return aImg;
+}
+
 static bool lcl_getServiceName ( const OUString rFileURL, OUString rName )
 {
 bool bRet = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2013-01-24 Thread Libreoffice Gerrit user 
 sfx2/inc/sfx2/basedlgs.hxx  |8 +---
 sfx2/source/dialog/basedlgs.cxx |6 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 04f21f9ad6c4b5be606f3c62fd10b3f1c2df283a
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jan 24 12:53:52 2013 +

SingleTabDlgImpl::m_pTabPage never used

Change-Id: I958fb2a42f8cc0ed87a98c68a303c8d6d6195079

diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 2d3abba..d532f3c 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -153,14 +153,16 @@ public:
 
 struct SingleTabDlgImpl
 {
-TabPage*m_pTabPage;
 SfxTabPage* m_pSfxPage;
 FixedLine*  m_pLine;
 String  m_sInfoURL;
 Linkm_aInfoLink;
 
-SingleTabDlgImpl() :
-m_pTabPage( NULL ), m_pSfxPage( NULL ), m_pLine( NULL ) {}
+SingleTabDlgImpl()
+: m_pSfxPage(NULL)
+, m_pLine(NULL)
+{
+}
 };
 
 typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale 
Which-Werte
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index f0a9d7d..341e591 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -776,7 +776,6 @@ SfxSingleTabDialog::~SfxSingleTabDialog()
 delete pOKBtn;
 delete pCancelBtn;
 delete pHelpBtn;
-delete pImpl-m_pTabPage;
 delete pImpl-m_pSfxPage;
 delete pImpl-m_pLine;
 delete pImpl;
@@ -804,10 +803,7 @@ void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
 if ( !pHelpBtn )
 pHelpBtn = new HelpButton( this );
 
-if ( pImpl-m_pTabPage )
-delete pImpl-m_pTabPage;
-if ( pImpl-m_pSfxPage )
-delete pImpl-m_pSfxPage;
+delete pImpl-m_pSfxPage;
 pImpl-m_pSfxPage = pTabPage;
 fnGetRanges = pRangesFunc;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source unusedcode.easy

2012-12-14 Thread Libreoffice Gerrit user 
 sfx2/inc/sfx2/thumbnailview.hxx   |2 --
 sfx2/source/control/thumbnailview.cxx |   11 ---
 unusedcode.easy   |1 -
 3 files changed, 14 deletions(-)

New commits:
commit edf999c3f42cc97a0340cf253a80885a24cedf24
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Dec 15 00:23:23 2012 +0100

Remove unused ThumbnailView::GetScrollWidth()

Change-Id: I8d3337e6ff30276c9de6c5de4836ea75ed6c8d99

diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 9548bd1..bc5aae9 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -227,8 +227,6 @@ public:
 
 bool IsColor() const { return maColor.GetTransparency() == 0; }
 
-longGetScrollWidth() const;
-
 void filterItems (const boost::functionbool (const ThumbnailViewItem*)  
func);
 
 void sortItems (const boost::functionbool (const ThumbnailViewItem*,
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 06942e5..b9b0e89 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -945,17 +945,6 @@ bool ThumbnailView::StartDrag( const CommandEvent rCEvt, 
Region rRegion )
 return true;
 }
 
-long ThumbnailView::GetScrollWidth() const
-{
-if ( GetStyle()  WB_VSCROLL )
-{
-((ThumbnailView*)this)-ImplInitScrollBar();
-return mpScrBar-GetSizePixel().Width()+mnScrBarOffset;
-}
-else
-return 0;
-}
-
 void ThumbnailView::filterItems (const boost::functionbool (const 
ThumbnailViewItem*)  func)
 {
 mnFirstLine = 0;// start at the top of the list instead of the 
current position
diff --git a/unusedcode.easy b/unusedcode.easy
index 7ef0ae2..cce5489 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -10,7 +10,6 @@ ScVbaFormatooo::vba::excel::XStyle::getAddIndent()
 ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any 
const)
 SfxDocumentTemplateDlg::SfxDocumentTemplateDlg(Window*, SfxDocumentTemplates*)
 TextEngine::GetLeftMargin() const
-ThumbnailView::GetScrollWidth() const
 ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any 
const, com::sun::star::uno::Any const)
 TransitionScene::clear()
 UnoControl::UnoControl()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-12-12 Thread Libreoffice Gerrit user 
 sfx2/inc/templatedlg.hxx|   15 +
 sfx2/source/doc/templatedlg.cxx |  103 +---
 sfx2/source/doc/templatedlg.hrc |   12 ++--
 sfx2/source/doc/templatedlg.src |   79 +-
 4 files changed, 79 insertions(+), 130 deletions(-)

New commits:
commit 7b66f322966d974ae7b3456f2e1b71e6e4807622
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Dec 12 15:43:24 2012 +0100

Template manager: use tabs instead of buttons to filter the documents

Change-Id: I2ec7baffaf5e88c7daf6040bdac8e173651b42f1

diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index ae2cb16..bbdcbda 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -14,6 +14,7 @@
 
 #include vcl/dialog.hxx
 #include vcl/button.hxx
+#include vcl/tabctrl.hxx
 
 class Edit;
 class PopupMenu;
@@ -45,11 +46,7 @@ public:
 
 void setDocumentModel (const 
com::sun::star::uno::Referencecom::sun::star::frame::XModel rModel);
 
-DECL_LINK(ViewAllHdl, void*);
-DECL_LINK(ViewDocsHdl, void*);
-DECL_LINK(ViewPresentsHdl, void*);
-DECL_LINK(ViewSheetsHdl, void*);
-DECL_LINK(ViewDrawsHdl, void*);
+DECL_LINK(ActivatePageHdl, void*);
 
 private:
 
@@ -87,8 +84,6 @@ private:
 void OnRepositoryDelete ();
 void OnTemplateSaveAs ();
 
-void centerTopButtons ();
-
 void createRepositoryMenu ();
 
 void createDefaultTemplateMenu ();
@@ -116,11 +111,7 @@ private:
 
 private:
 
-PushButton aButtonAll;
-PushButton aButtonDocs;
-PushButton aButtonPresents;
-PushButton aButtonSheets;
-PushButton aButtonDraws;
+TabControl maTabControl;
 Control *mpToolbars;
 
 Edit *mpSearchEdit;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index e0ea98c..548fdd9 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -99,12 +99,8 @@ private:
 
 SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
 : ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
-  aButtonAll(this,SfxResId(BTN_SELECT_ALL)),
-  aButtonDocs(this,SfxResId(BTN_SELECT_DOCS)),
-  aButtonPresents(this,SfxResId(BTN_SELECT_PRESENTATIONS)),
-  aButtonSheets(this,SfxResId(BTN_SELECT_SHEETS)),
-  aButtonDraws(this,SfxResId(BTN_SELECT_DRAWS)),
-  mpToolbars( new Control(this,SfxResId(TOOLBARS))),
+  maTabControl(this,SfxResId(TAB_CONTROL)),
+  mpToolbars( new Control(maTabControl,SfxResId(TOOLBARS))),
   mpSearchEdit(new Edit(this,WB_HIDE | WB_BORDER)),
   mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))),
   mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))),
@@ -131,6 +127,14 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 
 Size aWinSize = GetOutputSize();
 
+// Fit the tab page control and the toolbars
+Size aTabSize = maTabControl.GetSizePixel();
+Size aTabPageSize = maTabControl.GetTabPageSizePixel();
+Point aToolbarsPos(0, aTabSize.getHeight() - aTabPageSize.getHeight());
+mpToolbars-SetPosPixel(aToolbarsPos);
+aTabPageSize.setHeight(mpToolbars-GetSizePixel().getHeight() + 3);
+maTabControl.SetTabPageSizePixel(aTabPageSize);
+
 // Calculate toolboxs size and positions
 Size aViewSize = mpViewBar-CalcMinimumWindowSizePixel();
 Size aActionSize = mpActionBar-CalcMinimumWindowSizePixel();
@@ -166,7 +170,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 
 // Set view position below toolbox
 Point aViewPos = maView-GetPosPixel();
-aViewPos.setY(mpToolbars-GetPosPixel().Y() + 
mpToolbars-GetSizePixel().getHeight());
+aViewPos.setY(maTabControl.GetPosPixel().Y() + 
maTabControl.GetSizePixel().getHeight());
 aViewPos.setX(0);
 Size aThumbSize(aWinSize.getWidth(), aWinSize.getHeight() - 
aViewPos.getY());
 maView-SetPosSizePixel(aViewPos, aThumbSize);
@@ -179,7 +183,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 aSearchSize.setWidth(aWinSize.getWidth() - 2*PADDING_DLG_BORDER);
 
 mpSearchEdit-SetSizePixel(aSearchSize);
-
mpSearchEdit-SetPosPixel(Point(PADDING_DLG_BORDER,aActionPos.Y()+aActionSize.getHeight()));
+mpSearchEdit-SetPosPixel(Point(PADDING_DLG_BORDER,aViewPos.Y()));
 
mpSearchEdit-SetUpdateDataHdl(LINK(this,SfxTemplateManagerDlg,SearchUpdateHdl));
 mpSearchEdit-EnableUpdateData();
 
@@ -218,17 +222,11 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 
 
mpSearchView-setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVTemplateStateHdl));
 
-aButtonAll.SetClickHdl(LINK(this,SfxTemplateManagerDlg,ViewAllHdl));
-aButtonDocs.SetClickHdl(LINK(this,SfxTemplateManagerDlg,ViewDocsHdl));
-
aButtonPresents.SetClickHdl(LINK(this,SfxTemplateManagerDlg,ViewPresentsHdl));
-aButtonSheets.SetClickHdl(LINK(this,SfxTemplateManagerDlg,ViewSheetsHdl));
-

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-08-27 Thread Libreoffice Gerrit user 
 sfx2/inc/sfx2/sfx.hrc |1 +
 sfx2/source/doc/QuerySaveDocument.cxx |1 +
 sfx2/source/doc/doc.src   |8 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 097a0b91add3fa0d2b142804bf040940010f7658
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Mon Aug 27 11:10:20 2012 +0200

Modified the wording of the Save-on-Exit-Dialog

Change-Id: Ie3a02efc4541754ba553909ad03a115258890351
Reviewed-on: https://gerrit.libreoffice.org/491
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com

diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 0d44061..c215a18 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -162,6 +162,7 @@
 #define STR_KB  (RID_SFX_START+112)
 #define STR_MB  (RID_SFX_START+113)
 #define STR_GB  (RID_SFX_START+114)
+#define STR_QUERY_SAVE_DOCUMENT_TITLE   (RID_SFX_START+115)
 
 #define STR_STANDARD_SHORTCUT   (RID_SFX_START+117)
 #define STR_REPAIREDDOCUMENT(RID_SFX_START+118)
diff --git a/sfx2/source/doc/QuerySaveDocument.cxx 
b/sfx2/source/doc/QuerySaveDocument.cxx
index 2510e9a..49448eb 100644
--- a/sfx2/source/doc/QuerySaveDocument.cxx
+++ b/sfx2/source/doc/QuerySaveDocument.cxx
@@ -36,6 +36,7 @@ short ExecuteQuerySaveDocument(Window* _pParent,const String 
_rTitle)
 aText.SearchAndReplace( DEFINE_CONST_UNICODE( $(DOC) ),
 _rTitle );
 QueryBox aQBox( _pParent, WB_YES_NO_CANCEL | WB_DEF_YES, aText );
+aQBox.SetText(SfxResId(STR_QUERY_SAVE_DOCUMENT_TITLE).toString()); // 
Window title
 aQBox.SetButtonText( BUTTONID_NO, SfxResId(STR_NOSAVEANDCLOSE).toString() 
);
 aQBox.SetButtonText( BUTTONID_YES, SfxResId(STR_SAVEDOC).toString() );
 return aQBox.Execute();
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 3b5293d..640283d 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -46,9 +46,13 @@ QueryBox MSG_REGION_NOTEMPTY
 DefButton = WB_DEF_NO ;
 Message [ en-US ] = The category is not empty.\nDelete anyway? ;
 };
+String STR_QUERY_SAVE_DOCUMENT_TITLE
+{
+Text [ en-US ] = Save document ;
+};
 String STR_QUERY_SAVE_DOCUMENT
 {
-Text [ en-US ] = The document \$(DOC)\ has been modified.\nDo you want 
to save your changes? ;
+Text [ en-US ] = Save changes to document \$(DOC)\ before closing? ;
 };
 Bitmap BMP_STYLES_CLOSED { File = newex.bmp ; };
 Bitmap BMP_STYLES_OPENED { File = newex.bmp ; };
@@ -307,7 +311,7 @@ String STR_DOCTYPENAME_MESSAGE
 
 String STR_NOSAVEANDCLOSE
 {
-Text [ en-US ] = ~Discard ;
+Text [ en-US ] = Close ~without saving ;
 };
 
 String STR_PACKNGO_NOACCESS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-08-20 Thread Libreoffice Gerrit user 
 sfx2/inc/sfx2/app.hxx|1 -
 sfx2/inc/sfx2/objsh.hxx  |1 -
 sfx2/source/appl/app.cxx |1 -
 sfx2/source/appl/appmain.cxx |6 --
 sfx2/source/doc/objmisc.cxx  |6 --
 5 files changed, 15 deletions(-)

New commits:
commit 5eac8941849c30b454f8a1e74a232cd995fc57d3
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Aug 20 12:24:14 2012 +0100

PreInit and MemoryError can be removed from core

The logic of 8fb5a686f40eadd2bdd9519fc65f23cc29ec3163 in binfilter
appears to hold for core as well

Change-Id: I73cd47586c4c83858f9eca92e019ad0108b514e0

diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 80be15d..5ff15f2 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -136,7 +136,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
 voidInit();
 voidExit();
 voidSettingsChange( sal_uInt16, const AppSettings 
 );
-voidPreInit( );
 voidQuit();
 voidDeinitialize();
 
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 5e96dc8..4b1c16b 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -443,7 +443,6 @@ public:
 // Misc
 sal_BoolIsPreview() const;
 SfxObjectCreateMode GetCreateMode() const { return eCreateMode; }
-virtual voidMemoryError();
 SfxProgress*GetProgress() const;
 voidSetWaitCursor( sal_Bool bSet ) const;
 
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 4ee6df4..3aa48ab 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -187,7 +187,6 @@ SfxApplication::SfxApplication()
 
 pAppData_Impl = new SfxAppData_Impl( this );
 pAppData_Impl-m_xImeStatusWindow-init();
-pApp-PreInit();
 
 RTL_LOGFILE_CONTEXT_TRACE( aLog, { initialize DDE );
 
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index d2f66bf..edf1478 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -103,12 +103,6 @@ void SfxApplication::Exit()
 {
 }
 
-//---
-
-void SfxApplication::PreInit( )
-{
-}
-
 //-
 
 SfxFilterMatcher SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index ada681f..842d716 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -983,12 +983,6 @@ void SfxObjectShell::SetNoName()
 
 //
 
-void SfxObjectShell::MemoryError()
-{
-}
-
-//
-
 SfxProgress* SfxObjectShell::GetProgress() const
 {
 return pImp-pProgress;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-08-20 Thread Libreoffice Gerrit user 
 sfx2/inc/sfx2/thumbnailview.hxx   |   10 --
 sfx2/source/control/thumbnailview.cxx |   13 -
 2 files changed, 23 deletions(-)

New commits:
commit 21a4d3cafa0f959613991b0b6777c58557ec56c1
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Tue Aug 21 00:10:09 2012 -0430

Remove unused attributes from ThumbnailView class.

Change-Id: I4cb95d4f2f11eed332067e332bd9dfd95d119ce9

diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 6f0978d..a42b805 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -195,10 +195,6 @@ public:
 
 sal_uInt16 GetItemId( const Point rPos ) const;
 
-sal_uInt16 GetColCount() const { return mnUserCols; }
-
-sal_uInt16 GetLineCount() const { return mnUserVisLines; }
-
 long GetItemWidth() const { return mnItemWidth; }
 
 long GetItemHeight() const { return mnItemHeight; }
@@ -319,7 +315,6 @@ protected:
 
 protected:
 
-Timer maTimer;
 ValueItemList mItemList;
 ScrollBar* mpScrBar;
 Rectangle maItemListRect;
@@ -331,15 +326,10 @@ protected:
 long mnDisplayHeight;   // Height of the data display box (name, etc)
 long mnVisLines;
 long mnLines;
-long mnUserItemWidth;
-long mnUserItemHeight;
 sal_uInt16 mnScrBarOffset;
 sal_uInt16 mnSelItemId;
 sal_uInt16 mnHighItemId;
 sal_uInt16 mnCols;
-sal_uInt16 mnCurCol;
-sal_uInt16 mnUserCols;
-sal_uInt16 mnUserVisLines;
 sal_uInt16 mnFirstLine;
 sal_uInt16 mnSpacing;
 bool mbScroll : 1;
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index ff1b61e..6e221bb 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -89,16 +89,11 @@ void ThumbnailView::ImplInit()
 mnItemPadding = 0;
 mnVisLines  = 0;
 mnLines = 0;
-mnUserItemWidth = 0;
-mnUserItemHeight= 0;
 mnFirstLine = 0;
 mnScrBarOffset = 1;
 mnSelItemId = 0;
 mnHighItemId= 0;
 mnCols  = 0;
-mnCurCol= 0;
-mnUserCols  = 0;
-mnUserVisLines  = 0;
 mnSpacing   = 0;
 mbScroll= false;
 mbHasVisibleItems   = false;
@@ -258,15 +253,9 @@ void ThumbnailView::CalculateItemPositions ()
 if (!mnCols)
 mnCols = 1;
 
-if ( mnUserCols  mnUserCols  mnCols )
-mnCols = mnUserCols;
-
 // calculate maximum number of visible rows
 mnVisLines = (sal_uInt16)((aWinSize.Height()-mnHeaderHeight) / 
(mnItemHeight));
 
-if ( mnUserVisLines  mnUserVisLines  mnVisLines )
-mnVisLines = mnUserVisLines;
-
 // calculate empty space
 long nHSpace = aWinSize.Width()-nScrBarWidth - mnCols*mnItemWidth;
 long nVSpace = aWinSize.Height()-mnHeaderHeight - mnVisLines*mnItemHeight;
@@ -848,7 +837,6 @@ void ThumbnailView::RemoveItem( sal_uInt16 nItemId )
 // reset variables
 if ( (mnHighItemId == nItemId) || (mnSelItemId == nItemId) )
 {
-mnCurCol= 0;
 mnHighItemId= 0;
 mnSelItemId = 0;
 }
@@ -865,7 +853,6 @@ void ThumbnailView::Clear()
 
 // reset variables
 mnFirstLine = 0;
-mnCurCol= 0;
 mnHighItemId= 0;
 mnSelItemId = 0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-08-12 Thread Rafael Dominguez 
 sfx2/inc/sfx2/thumbnailviewitem.hxx   |   11 
 sfx2/source/control/templatelocalviewitem.cxx |   35 --
 sfx2/source/control/templateviewitem.cxx  |   22 ++--
 sfx2/source/control/thumbnailviewitem.cxx |   28 +++-
 4 files changed, 89 insertions(+), 7 deletions(-)

New commits:
commit 6050dad25fb34d6c7bf4feb0d850e9277d92c91e
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sun Aug 12 23:33:20 2012 -0430

Draw borders arounds thumbnail.

Change-Id: Icaf9485d20c8e747d08371a1db5f4d7bee2d37bb

diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx 
b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index 3b1aa95..aab7fe3 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -44,10 +44,18 @@ class Font;
 class Window;
 class ThumbnailView;
 
+namespace basegfx {
+class B2DPoint;
+}
+
 namespace drawinglayer {
 namespace processor2d {
 class BaseProcessor2D;
 }
+
+namespace primitive2d {
+class BorderLinePrimitive2D;
+}
 }
 
 struct ThumbnailItemAttributes
@@ -109,6 +117,9 @@ public:
 virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
 const ThumbnailItemAttributes *pAttrs);
 
+static drawinglayer::primitive2d::BorderLinePrimitive2D*
+createBorderLine (const basegfx::B2DPoint rStart, const 
basegfx::B2DPoint rEnd);
+
 private:
 
 DECL_LINK (OnClick, CheckBox *);
diff --git a/sfx2/source/control/templatelocalviewitem.cxx 
b/sfx2/source/control/templatelocalviewitem.cxx
index 765b544..f337df8 100644
--- a/sfx2/source/control/templatelocalviewitem.cxx
+++ b/sfx2/source/control/templatelocalviewitem.cxx
@@ -12,6 +12,7 @@
 #include basegfx/matrix/b2dhommatrixtools.hxx
 #include basegfx/polygon/b2dpolygon.hxx
 #include drawinglayer/attribute/fillbitmapattribute.hxx
+#include drawinglayer/primitive2d/borderlineprimitive2d.hxx
 #include drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
 #include drawinglayer/primitive2d/polypolygonprimitive2d.hxx
 #include drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -38,10 +39,10 @@ void TemplateLocalViewItem::Paint 
(drawinglayer::processor2d::BaseProcessor2D *p
 const ThumbnailItemAttributes *pAttrs)
 {
 int nCount = 0;
-int nSeqSize = 3;
+int nSeqSize = 7;
 
 if (!maPreview2.IsEmpty())
-++nSeqSize;
+nSeqSize += 5;
 
 BColor aFillColor = pAttrs-aFillColor;
 Primitive2DSequence aSeq(nSeqSize);
@@ -73,6 +74,21 @@ void TemplateLocalViewItem::Paint 
(drawinglayer::processor2d::BaseProcessor2D *p
 
B2DVector(aImageSize.Width(),aImageSize.Height()),
 false)
 ));
+
+// draw thumbnail borders
+float fWidth = aImageSize.Width()*fScaleX;
+float fHeight = aImageSize.Height()*fScaleY;
+float fPosX = aPos.getX()+35*fScaleX;
+float fPosY = aPos.getY()+20*fScaleY;
+
+aSeq[nCount++] = 
Primitive2DReference(createBorderLine(B2DPoint(fPosX,fPosY),
+   
B2DPoint(fPosX+fWidth,fPosY)));
+aSeq[nCount++] = 
Primitive2DReference(createBorderLine(B2DPoint(fPosX+fWidth,fPosY),
+   
B2DPoint(fPosX+fWidth,fPosY+fHeight)));
+aSeq[nCount++] = 
Primitive2DReference(createBorderLine(B2DPoint(fPosX+fWidth,fPosY+fHeight),
+   
B2DPoint(fPosX,fPosY+fHeight)));
+aSeq[nCount++] = 
Primitive2DReference(createBorderLine(B2DPoint(fPosX,fPosY+fHeight),
+   
B2DPoint(fPosX,fPosY)));
 }
 
 aSeq[nCount++] = Primitive2DReference( new FillBitmapPrimitive2D(
@@ -83,6 +99,21 @@ void TemplateLocalViewItem::Paint 
(drawinglayer::processor2d::BaseProcessor2D *p
 false)
 ));
 
+// draw thumbnail borders
+float fWidth = aImageSize.Width()*fScaleX;
+float fHeight = aImageSize.Height()*fScaleY;
+float fPosX = aPos.getX();
+float fPosY = aPos.getY();
+
+aSeq[nCount++] = 
Primitive2DReference(createBorderLine(B2DPoint(fPosX,fPosY),
+   
B2DPoint(fPosX+fWidth,fPosY)));
+aSeq[nCount++] = 
Primitive2DReference(createBorderLine(B2DPoint(fPosX+fWidth,fPosY),
+   
B2DPoint(fPosX+fWidth,fPosY+fHeight)));
+aSeq[nCount++] = 
Primitive2DReference(createBorderLine(B2DPoint(fPosX+fWidth,fPosY+fHeight),
+   
B2DPoint(fPosX,fPosY+fHeight)));
+aSeq[nCount++] =

[Libreoffice-commits] .: sfx2/inc sfx2/source unusedcode.easy

2012-08-09 Thread Julien Nabet 
 sfx2/inc/sfx2/thumbnailview.hxx   |1 -
 sfx2/source/control/thumbnailview.cxx |5 -
 unusedcode.easy   |1 -
 3 files changed, 7 deletions(-)

New commits:
commit 282917d574d6df820ddb5583b8bbf17fc7af6b7a
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Aug 9 16:23:21 2012 +0200

Bin ThumbnailView::ImplGetFirstItem()

Change-Id: I212af5f0f6d3ad4df6492c593da51eaa4b34948d

diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index a5102e3..9a9e516 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -312,7 +312,6 @@ protected:
 SFX2_DLLPRIVATE bool ImplScroll( const Point rPos );
 SFX2_DLLPRIVATE size_t   ImplGetItem( const Point rPoint, bool bMove 
= false ) const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetItem( size_t nPos );
-SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetFirstItem();
 SFX2_DLLPRIVATE sal_uInt16  ImplGetVisibleItemCount() const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetVisibleItem( sal_uInt16 
nVisiblePos );
 SFX2_DLLPRIVATE void ImplInsertItem( ThumbnailViewItem *const 
pItem, const size_t nPos );
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index c736182..ad2f5b8 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -452,11 +452,6 @@ ThumbnailViewItem* ThumbnailView::ImplGetItem( size_t nPos 
)
 return ( nPos  mItemList.size() ) ? mItemList[nPos] : NULL;
 }
 
-ThumbnailViewItem* ThumbnailView::ImplGetFirstItem()
-{
-return mItemList.empty() ? NULL : mItemList[0];
-}
-
 sal_uInt16 ThumbnailView::ImplGetVisibleItemCount() const
 {
 sal_uInt16 nRet = 0;
diff --git a/unusedcode.easy b/unusedcode.easy
index ff81200..4681351 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -29,7 +29,6 @@ SvxPositionSizeTabPage::GetRect()
 TempFile::IsValid() const
 TextEngine::GetLeftMargin() const
 ThumbnailView::GetItemCount() const
-ThumbnailView::ImplGetFirstItem()
 ThumbnailView::InsertItem(unsigned short, BitmapEx const, rtl::OUString 
const, unsigned long)
 ThumbnailView::LinkStubImplTimerHdl(void*, void*)
 ThumbnailView::SetColCount(unsigned short)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-07-29 Thread Rafael Dominguez 
 sfx2/inc/sfx2/templatefolderview.hxx   |3 +--
 sfx2/source/control/templatefolderview.cxx |4 ++--
 sfx2/source/doc/templatedlg.cxx|2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 2fd593ae8a8140188da31bb4fb76f7a9baaba339
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sun Jul 29 21:48:53 2012 -0430

Fix WaE, unused parameter.

Change-Id: I00104a446fa23da1ace696d46108bfc943ba04bf

diff --git a/sfx2/inc/sfx2/templatefolderview.hxx 
b/sfx2/inc/sfx2/templatefolderview.hxx
index cc7f957..44c61e0 100644
--- a/sfx2/inc/sfx2/templatefolderview.hxx
+++ b/sfx2/inc/sfx2/templatefolderview.hxx
@@ -58,8 +58,7 @@ public:
 
 bool moveTemplates (std::setconst ThumbnailViewItem* rItems, const 
sal_uInt16 nTargetItem, bool bCopy);
 
-void copyFrom (const sal_uInt16 nRegionItemId, const OUString rName,
-   const BitmapEx rThumbnail, const OUString rPath);
+void copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx rThumbnail, 
const OUString rPath);
 
 void copyFrom (TemplateFolderViewItem *pItem, const rtl::OUString rPath);
 
diff --git a/sfx2/source/control/templatefolderview.cxx 
b/sfx2/source/control/templatefolderview.cxx
index 657e543..31d7888 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -551,8 +551,8 @@ bool TemplateFolderView::moveTemplates(std::setconst 
ThumbnailViewItem * rIte
 return ret;
 }
 
-void TemplateFolderView::copyFrom(const sal_uInt16 nRegionItemId, const 
OUString rName,
-  const BitmapEx rThumbnail, const OUString 
rPath)
+void TemplateFolderView::copyFrom(const sal_uInt16 nRegionItemId, const 
BitmapEx rThumbnail,
+  const OUString rPath)
 {
 sal_uInt16 nId = 0;
 sal_uInt16 nRegionId = nRegionItemId - 1;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index fffc400..3b327df 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -948,7 +948,7 @@ void SfxTemplateManagerDlg::remoteMoveTo(const sal_uInt16 
nMenuId)
 const TemplateSearchViewItem *pItem =
 static_castconst TemplateSearchViewItem*(*aIter);
 
-
maView-copyFrom(nItemId,pItem-maTitle,pItem-maPreview1,pItem-getPath());
+maView-copyFrom(nItemId,pItem-maPreview1,pItem-getPath());
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-07-26 Thread Kohei Yoshida 
 sfx2/inc/sfx2/docfile.hxx   |2 +-
 sfx2/source/doc/docfile.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f16362fb7bf2d7823e8663ff56bcea235adfa513
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 25 21:29:36 2012 -0400

Pass by const reference.

Change-Id: Iead2319a5283af69bf0edd12c639f14ddeb402ad

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 563fd0f..9a134b6 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -191,7 +191,7 @@ public:
 voidCreateTempFile( sal_Bool bReplace = sal_True );
 voidCreateTempFileNoCopy();
 ::rtl::OUString SwitchDocumentToTempFile();
-sal_BoolSwitchDocumentToFile( ::rtl::OUString aURL );
+sal_BoolSwitchDocumentToFile( const rtl::OUString aURL );
 
 ::rtl::OUString GetBaseURL( bool bForSaving=false );
 
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 9924243..0996676 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3646,7 +3646,7 @@ sal_Bool SfxMedium::CallApproveHandler( const 
uno::Reference task::XInteraction
 return aResult;
 }
 
-sal_Bool SfxMedium::SwitchDocumentToFile( ::rtl::OUString aURL )
+sal_Bool SfxMedium::SwitchDocumentToFile( const rtl::OUString aURL )
 {
 // the method is only for storage based documents
 bool bResult = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source sw/source

2012-07-25 Thread Kohei Yoshida 
 sfx2/inc/sfx2/sfxhtml.hxx  |2 +-
 sfx2/source/bastyp/sfxhtml.cxx |2 +-
 sw/source/filter/html/htmlcss1.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c07fe0d98b14bce18ba676b7dcec6c6245b55660
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 25 16:29:26 2012 -0400

Remove unused parameter.

Change-Id: Ib6539528655c5def0d0802602ec913799f0ab07a

diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index e0ccf59..971d793 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -81,7 +81,7 @@ protected:
 // up by FinishFileDownload. To cancel the download should a shell be
 // left. It can only exist a single download at the same time, For every
 // started download FinshFileDownload must be called.
-void StartFileDownload( const String rURL, SfxObjectShell *pSh=0 );
+void StartFileDownload(const OUString rURL);
 
 // End of an asynchronous file download. Returns TRUE if the download
 // was successful. The read file is then passed into String.
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index fd6578d..9c64259 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -225,7 +225,7 @@ IMAPOBJ_SETEVENT:
 return bNewArea;
 }
 
-void SfxHTMLParser::StartFileDownload( const String rURL, SfxObjectShell* 
/*pSh*/ )
+void SfxHTMLParser::StartFileDownload(const OUString rURL)
 {
 DBG_ASSERT( !pDLMedium, StartFileDownload when active Download );
 if( pDLMedium )
diff --git a/sw/source/filter/html/htmlcss1.cxx 
b/sw/source/filter/html/htmlcss1.cxx
index ecc0f58..f3fe2b6 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1821,7 +1821,7 @@ void SwHTMLParser::InsertLink()
 if( GetMedium() )
 {
 // Download des Style-Source starten
-StartFileDownload(sHRef, pDoc-GetDocShell());
+StartFileDownload(sHRef);
 if( IsParserWorking() )
 {
 // Der Style wurde synchron geladen und wir koennen
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-07-25 Thread Kohei Yoshida 
 sfx2/inc/sfx2/docfile.hxx   |1 -
 sfx2/source/doc/docfile.cxx |   11 ---
 sfx2/source/doc/objmisc.cxx |   12 
 3 files changed, 24 deletions(-)

New commits:
commit 07c1dac0d8844b48290bac4b55c055cc897e61af
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 25 16:41:45 2012 -0400

Likewise, CharSet was set in SfxMedium but never used. Removing.

Change-Id: Ie7e6564ab1efa855df0202b88b7ff80ec71b8cb5

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index abf61a0..b4da325 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -201,7 +201,6 @@ public:
 ::rtl::OUString SwitchDocumentToTempFile();
 sal_BoolSwitchDocumentToFile( ::rtl::OUString aURL );
 
-voidSetCharset( ::rtl::OUString );
 ::rtl::OUString GetBaseURL( bool bForSaving=false );
 
 #if _SOLAR__PRIVATE
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index e8534ad..d6a0864 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -254,7 +254,6 @@ public:
 bool bIsStorage:1;
 bool bUseInteractionHandler:1;
 bool bAllowDefaultIntHdl:1;
-bool bIsCharsetInitialized:1;
 bool bDisposeStorage:1;
 bool bStorageBasedOnInStream:1;
 bool m_bSalvageMode:1;
@@ -305,7 +304,6 @@ public:
 uno::Reference io::XStream  m_xLockingStream;
 
 sal_uInt32  nLastStorageError;
-::rtl::OUString aCharset;
 
 ::com::sun::star::uno::Reference 
::com::sun::star::task::XInteractionHandler  xInteraction;
 
@@ -336,7 +334,6 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
 bIsStorage( false ),
 bUseInteractionHandler( true ),
 bAllowDefaultIntHdl( false ),
-bIsCharsetInitialized( false ),
 bStorageBasedOnInStream( false ),
 m_bSalvageMode( false ),
 m_bVersionsAlreadyLoaded( false ),
@@ -3070,8 +3067,6 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl()
 
 if ( GetContent().is() )
 {
-pImp-bIsCharsetInitialized = true;
-
 try
 {
 Any aAny = pImp-aContent.getPropertyValue( 
::rtl::OUString(MediaType) );
@@ -3414,12 +3409,6 @@ void SfxMedium::CreateTempFileNoCopy()
 CloseStorage();
 }
 
-void SfxMedium::SetCharset( ::rtl::OUString aChs )
-{
-pImp-bIsCharsetInitialized = true;
-pImp-aCharset = aChs;
-}
-
 sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const 
::rtl::OUString aODFVersion, sal_Bool bHasValidDocumentSignature )
 {
 bool bChanges = false;
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 5aa85a2..8eada23 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1668,18 +1668,6 @@ void SfxHeaderAttributes_Impl::SetAttribute( const 
SvKeyValue rKV )
 pDoc-GetMedium()-SetExpired_Impl( Date( 1, 1, 1970 ) );
 }
 }
-else if( rKV.GetKey().CompareIgnoreCaseToAscii( content-type ) == 
COMPARE_EQUAL )
-{
-String sType, sSubType;
-INetContentTypeParameterList aParameters;
-
-if (INetContentTypes::parse(aValue, sType, sSubType, aParameters))
-{
-const INetContentTypeParameter * pCharset = 
aParameters.find(charset);
-if (pCharset != 0)
-pDoc-GetMedium()-SetCharset( pCharset-m_sValue );
-}
-}
 }
 
 void SfxHeaderAttributes_Impl::Append( const SvKeyValue rKV )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-07-24 Thread Kohei Yoshida 
 sfx2/inc/sfx2/sfxbasemodel.hxx   |3 +--
 sfx2/source/doc/sfxbasemodel.cxx |6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit e05a284f0b3beb93ffcea43663ff165a0dd2001a
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Jul 24 22:41:10 2012 -0400

Useless macro define.

Change-Id: I19e71dfd514b19e34c7d73642a8c6bc2d3464590

diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index bdb5d6a..844bc33 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -139,7 +139,6 @@
 #define NOSUPPORTEXCEPTION  ::com::sun::star::lang::NoSupportException
 #define RUNTIMEEXCEPTION::com::sun::star::uno::RuntimeException
 #define CLOSEVETOEXCEPTION  ::com::sun::star::util::CloseVetoException
-#define DOUBLEINITIALIZATIONEXCEPTION  
::com::sun::star::frame::DoubleInitializationException
 #define ILLEGALARGUMENTEXCEPTION 
::com::sun::star::lang::IllegalArgumentException
 #define IOEXCEPTION ::com::sun::star::io::IOException
 #define EXCEPTION   ::com::sun::star::uno::Exception
@@ -1042,7 +1041,7 @@ public:
 virtual void SAL_CALL loadFromStorage( const REFERENCE XSTORAGE  
xStorage,
 const 
::com::sun::star::uno::Sequence PROPERTYVALUE  aMediaDescriptor )
 throw ( ILLEGALARGUMENTEXCEPTION,
-DOUBLEINITIALIZATIONEXCEPTION,
+com::sun::star::frame::DoubleInitializationException,
 IOEXCEPTION,
 EXCEPTION,
 RUNTIMEEXCEPTION );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 8309d28..1641a6f 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1834,7 +1834,7 @@ void SAL_CALL SfxBaseModel::initNew()
 if ( m_pData-m_pObjectShell.Is() )
 {
 if( m_pData-m_pObjectShell-GetMedium() )
-throw DOUBLEINITIALIZATIONEXCEPTION();
+throw frame::DoubleInitializationException();
 
 sal_Bool bRes = m_pData-m_pObjectShell-DoInitNew( NULL );
 sal_uInt32 nErrCode = m_pData-m_pObjectShell-GetError() ?
@@ -1867,7 +1867,7 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence 
beans::PropertyValue 
 {
 if( m_pData-m_pObjectShell-GetMedium() )
 // if a Medium is present, the document is already initialized
-throw DOUBLEINITIALIZATIONEXCEPTION();
+throw frame::DoubleInitializationException();
 
 SfxMedium* pMedium = new SfxMedium( seqArguments );
 String aFilterName;
@@ -3515,7 +3515,7 @@ embed::VisualRepresentation SAL_CALL 
SfxBaseModel::getPreferredVisualRepresentat
 void SAL_CALL SfxBaseModel::loadFromStorage( const uno::Reference XSTORAGE  
xStorage,
  const uno::Sequence 
beans::PropertyValue  aMediaDescriptor )
 throw ( lang::IllegalArgumentException,
-DOUBLEINITIALIZATIONEXCEPTION,
+frame::DoubleInitializationException,
 IOEXCEPTION,
 EXCEPTION,
 uno::RuntimeException )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-07-06 Thread Michael Stahl 
 sfx2/inc/templatedlg.hxx|2 +-
 sfx2/source/doc/templatedlg.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bf744412213eb8b78d68e3ede9fa4ac77b4e0422
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jul 6 12:46:49 2012 +0200

SearchUpdateHdl: -Werror=unused-parameter

Change-Id: Iac43e6456fafc924143f3fc749863a56a0e7da12

diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 2efa11d..5fa51ae 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -64,7 +64,7 @@ private:
 
 DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*);
 
-DECL_LINK(SearchUpdateHdl, Edit*);
+DECL_LINK(SearchUpdateHdl, void*);
 
 void OnTemplateImport ();
 void OnTemplateSearch ();
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 77f9032..8bf2c44 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -559,7 +559,7 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, 
ThumbnailViewItem*, pItem)
 return 0;
 }
 
-IMPL_LINK (SfxTemplateManagerDlg, SearchUpdateHdl, Edit*, pEdit)
+IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
 {
 // if the search view is hidden, hide the folder view and display search 
one
 if (!mpSearchView-IsVisible())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-06-14 Thread Takeshi Abe 
 sfx2/inc/sfx2/app.hxx|1 -
 sfx2/source/appl/appbas.cxx  |6 --
 sfx2/source/appl/appquit.cxx |5 -
 3 files changed, 12 deletions(-)

New commits:
commit e9022aaa9053aff22cea804794a9eac082485626
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Fri Jun 15 01:54:40 2012 +0900

removed empty SfxApplication::SaveBasicManager() and its usage

See 6801a61711ebaa71781ec733da25bfbb364cb4ad
and b57bf0f202884261352cae750e09b97f570d3204

Change-Id: Ia63a5426a6445bffd4579d4535382bf93a97a589

diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index ea9dbc2..8cef648 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -203,7 +203,6 @@ public:
 com::sun::star::uno::Reference com::sun::star::script::XLibraryContainer 
 GetBasicContainer();
 StarBASIC*  GetBasic();
-sal_uInt16  SaveBasicManager() const;
 sal_uInt16  SaveBasicAndDialogContainer() const;
 
 // misc.
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index cc34ae2..87b54da 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -120,12 +120,6 @@ using namespace ::com::sun::star::script;
 using ::basic::BasicManagerRepository;
 
 //=
-sal_uInt16 SfxApplication::SaveBasicManager() const
-{
-return 0;
-}
-
-//
 sal_uInt16 SfxApplication::SaveBasicAndDialogContainer() const
 {
 if ( pAppData_Impl-pBasicManager-isValid() )
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index a4edf3a..e1dfc22 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -94,11 +94,6 @@ void SfxApplication::Deinitialize()
 #ifndef DISABLE_SCRIPTING
 StarBASIC::Stop();
 
-// Save BASIC if possible
-BasicManager* pBasMgr = 
BasicManagerRepository::getApplicationBasicManager( false );
-if ( pBasMgr  pBasMgr-IsModified() )
-SaveBasicManager();
-
 SaveBasicAndDialogContainer();
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-06-11 Thread Michael Stahl 
 sfx2/inc/sfx2/XmlIdRegistry.hxx|9 ++---
 sfx2/source/doc/DocumentMetadataAccess.cxx |7 +++
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 40b7eff9075c88d80fb0f3472d2671c5d2c72d0d
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jun 11 23:18:23 2012 +0200

un-inline isValidXmlId (MSVC doesn't like it anymore)

Change-Id: I59872f6e7fbdfc73875a45912b93d01b4379aec7

diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx
index 691bfaa..38db1f9 100644
--- a/sfx2/inc/sfx2/XmlIdRegistry.hxx
+++ b/sfx2/inc/sfx2/XmlIdRegistry.hxx
@@ -47,13 +47,8 @@ namespace sfx2 {
 /** is i_rIdref a valid NCName ? */
 bool SFX2_DLLPUBLIC isValidNCName(::rtl::OUString const  i_rIdref);
 
-extern inline bool
-isValidXmlId(::rtl::OUString const  i_rStreamName,
-::rtl::OUString const  i_rIdref)
-{
-return isValidNCName(i_rIdref)  ( i_rStreamName == content.xml || 
i_rStreamName == styles.xml );
-}
-
+bool SFX2_DLLPUBLIC isValidXmlId(::rtl::OUString const  i_rStreamName,
+::rtl::OUString const  i_rIdref);
 
 // XML ID handling ---
 
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx 
b/sfx2/source/doc/DocumentMetadataAccess.cxx
index bbe7555..4fb52ec 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -116,6 +116,13 @@ static bool isStylesFile (::rtl::OUString const  i_rPath)
 return i_rPath == s_styles;
 }
 
+bool isValidXmlId(::rtl::OUString const  i_rStreamName,
+::rtl::OUString const  i_rIdref)
+{
+return isValidNCName(i_rIdref)
+ (isContentFile(i_rStreamName) || isStylesFile(i_rStreamName));
+}
+
 static bool isReservedFile(::rtl::OUString const  i_rPath)
 {
 return isContentFile(i_rPath) || isStylesFile(i_rPath) || i_rPath == 
s_meta || i_rPath == s_settings;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-06-01 Thread Stephan Bergmann 
 sfx2/inc/sfx2/docfile.hxx|5 +
 sfx2/inc/sfx2/objsh.hxx  |1 +
 sfx2/source/doc/docfile.cxx  |   20 
 sfx2/source/doc/objmisc.cxx  |   12 
 sfx2/source/doc/objstor.cxx  |6 +++---
 sfx2/source/doc/objxtor.cxx  |2 +-
 sfx2/source/view/viewfrm.cxx |   28 
 7 files changed, 50 insertions(+), 24 deletions(-)

New commits:
commit b9ecec7c74687ed5a9470cffb7d02e0e6e83107e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 1 17:32:07 2012 +0200

Allow for editing of read-only documents

When e.g. viewing mail attachments (that have been stored r/o to some 
download
directory by the mail application), it would be nice if the user could 
easily
temporarily modify them (say, play around with a spreadsheet, changing some
numbers and triggering recalculation of formulas) by clicking the Edit 
File
button and not being asked to create a copy for editing.

This patch tries to make editability of a view independent of the r/o 
status of
the medium:

* SID_EDITDOC (the Edit File button) now only toggles the r/o status of 
the
  view.  It no longer asks to create a copy for editing if the underlying 
medium
  is r/o.

* When a modified document is toggled to r/o via SID_EDITDOC, LO still asks 
the
  user to save or discard the changes.  However, if the underlying medium is
  physically r/o (see next), saving the document opens the Save As dialog,
  instead of just doing a Save operation (which would fail on the r/o 
file).

* A new state of IsOriginallyReadOnly needed to be added to the medium, to
  keep track whether the medium was originally opened r/o (and is thus 
assumed
  to be physically r/o), as toggling SID_EDITDOC in the view also changes 
the
  open mode of the underlying medium.  Instead of trying to fully 
understand and
  disentangle that horrible mess, I just added yet another state to the 
mess...

* The title of the document window now contains (read-only) if and only if
  either the view is r/o or the medium is originally r/o (or both).

Change-Id: I89d9c6adf0baab411e737a5f4e6f4e770e7a70be

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index f7f85d5..ca8ad49 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -213,6 +213,11 @@ public:
 GetVersionList( bool _bNoReload = false );
 sal_BoolIsReadOnly();
 
+// Whether the medium had originally been opened r/o, independent of later
+// changes via SetOpenMode; used to keep track of the true state of the
+// medium across toggles via SID_EDITDOC (which do change SetOpenMode):
+boolIsOriginallyReadOnly() const;
+
 ::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream   
GetInputStream();
 
 voidCreateTempFile( sal_Bool bReplace = sal_True );
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 3c1837b..90acbb7 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -273,6 +273,7 @@ public:
 voidSetReadOnly();
 sal_BoolIsReadOnly() const;
 sal_BoolIsReadOnlyMedium() const;
+boolIsOriginallyReadOnlyMedium() const;
 voidSetReadOnlyUI( sal_Bool bReadOnly = sal_True );
 sal_BoolIsReadOnlyUI() const;
 voidSetNoName();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 4da1556..e77992e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -312,6 +312,8 @@ public:
 
 uno::Reference logging::XSimpleLogRing  m_xLogRing;
 
+bool m_originallyReadOnly;
+
 SfxMedium_Impl( SfxMedium* pAntiImplP );
 ~SfxMedium_Impl();
 };
@@ -339,7 +341,8 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP )
 pTempFile( NULL ),
 nLastStorageError( 0 ),
 m_bRemoveBackup( sal_False ),
-m_nSignatureState( SIGNATURESTATE_NOSIGNATURES )
+m_nSignatureState( SIGNATURESTATE_NOSIGNATURES ),
+m_originallyReadOnly(false)
 {
 aDoneLink.CreateMutex();
 }
@@ -1057,6 +1060,11 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool 
bLoading, sal_Bool bNoUI )
 bContentReadonly = IsReadonlyAccordingACL( 
aPhysPath.GetBuffer() );
 }
 #endif
+
+if ( bContentReadonly )
+{
+pImp-m_originallyReadOnly = true;
+}
 }
 
 // do further checks only if the file not readonly in fs
@@ -2874,15 +2882,14 @@ SfxMedium::SfxMedium( const 
::com::sun::star::uno::Sequence ::com::sun::star::b
 }
 }
 
-sal_Bool bReadOnly = sal_False;
 SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, 
sal_False );

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-05-28 Thread Tor Lillqvist 
 sfx2/inc/sfx2/childwin.hxx   |3 ---
 sfx2/inc/sfx2/viewfrm.hxx|3 ---
 sfx2/source/view/viewfrm.cxx |8 
 3 files changed, 14 deletions(-)

New commits:
commit dc4f1b6c2116bfca4a12cc6ef6f2a9a596c0a6da
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon May 28 15:54:47 2012 +0300

Whatever an inimanager was, it has been dead for a decade

Change-Id: I6efd7877df34af515e61b6b7fcd112fa041f5e61

diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index c96d1a6..c3f554f 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -34,9 +34,6 @@
 #include vcl/window.hxx
 #include com/sun/star/frame/XFrame.hpp
 
-#ifdef ENABLE_INIMANAGER
-#include inimgr.hxx
-#endif
 #include sfx2/shell.hxx
 #include sfx2/chalign.hxx
 
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 5a99c48..18c8678 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -129,9 +129,6 @@ public:
 virtual voidSetZoomFactor( const Fraction rZoomX, const 
Fraction rZoomY );
 
 SfxProgress*GetProgress() const;
-#ifdef ENABLE_INIMANAGER//MUSTINI
-SfxIniManager*  GetIniManager() const;
-#endif
 
 SfxObjectShell* GetObjectShell() const
 { return xObjSh; }
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 579a10d..0538bce 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1594,14 +1594,6 @@ void SfxViewFrame::HideStatusText()
 }
 
 //
-#ifdef ENABLE_INIMANAGER//MUSTINI
-SfxIniManager* SfxViewFrame::GetIniManager() const
-{
-return SFX_APP()-GetAppIniManager();
-}
-#endif
-
-//
 void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer...
 (
 SfxViewShell*   pSh,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-05-04 Thread Stephan Bergmann 
 sfx2/inc/sfx2/docfile.hxx   |4 ++--
 sfx2/source/doc/docfile.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5794a9403059796a855c873f0e0f19f6cdbb2646
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri May 4 14:55:26 2012 +0200

Improved variable name

Change-Id: Id3a505afa3d8a6e99beeccafe30713cf40fc0c76

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 53846f3..70fae05 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -94,9 +94,9 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
 String  aLongName;
 sal_BoolbRemote;
 
-sal_Boolm_bIsReadOnly;
 com::sun::star::uno::Referencecom::sun::star::io::XInputStream
 m_xInputStreamToLoadFrom;
+boolm_bInputStreamIsReadOnly;
 
 #if _SOLAR__PRIVATE
 SAL_DLLPRIVATE void SetIsRemote_Impl();
@@ -131,7 +131,7 @@ public:
 GetInteractionHandler();
 
 void setStreamToLoadFrom(const 
com::sun::star::uno::Referencecom::sun::star::io::XInputStream 
xInputStream,sal_Bool bIsReadOnly )
-{ m_xInputStreamToLoadFrom = xInputStream; m_bIsReadOnly = bIsReadOnly; }
+{ m_xInputStreamToLoadFrom = xInputStream; m_bInputStreamIsReadOnly = 
bIsReadOnly; }
 
 voidSetLoadTargetFrame(SfxFrame* pFrame );
 SfxFrame*   GetLoadTargetFrame() const;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index ced1950..2daebae 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2277,7 +2277,7 @@ void SfxMedium::GetMedium_Impl()
 {
 pImp-xInputStream = m_xInputStreamToLoadFrom;
 pImp-xInputStream-skipBytes(0);
-if(m_bIsReadOnly)
+if(m_bInputStreamIsReadOnly)
 GetItemSet()-Put( SfxBoolItem( SID_DOC_READONLY, sal_True 
) );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source svl/inc svl/source svtools/inc svtools/source unusedcode.easy

2012-02-17 Thread Michael Meeks 
 sfx2/inc/sfx2/app.hxx|1 
 sfx2/inc/sfx2/childwin.hxx   |2 -
 sfx2/inc/sfx2/hintpost.hxx   |1 
 sfx2/inc/sfx2/mnuitem.hxx|1 
 sfx2/inc/sfx2/progress.hxx   |1 
 sfx2/source/appl/appmain.cxx |4 --
 sfx2/source/bastyp/progress.cxx  |   39 
 sfx2/source/menu/mnuitem.cxx |8 -
 sfx2/source/notify/hintpost.cxx  |6 ---
 svl/inc/svl/nranges.hxx  |2 -
 svl/inc/svl/rngitem.hxx  |1 
 svl/source/items/nranges.cxx |   61 ---
 svl/source/items/rngitem_inc.cxx |   10 --
 svtools/inc/svtools/wallitem.hxx |2 -
 svtools/source/misc/wallitem.cxx |4 +-
 unusedcode.easy  |8 -
 16 files changed, 4 insertions(+), 147 deletions(-)

New commits:
commit ada6350a7cdf4984eb3ead31d938004bf9177ae8
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Fri Feb 17 21:47:49 2012 +

Removed unused code from svl and sfx2

diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index c255035..ea9dbc2 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -147,7 +147,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
 voidInit();
 voidExit();
 voidSettingsChange( sal_uInt16, const AppSettings 
 );
-voidMain( );
 voidPreInit( );
 voidQuit();
 voidDeinitialize();
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index fc7cf83..c96d1a6 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -307,7 +307,7 @@ public:
 return pWin; \
 } \
 sal_uInt16 Class::GetChildWindowId () \
-{ return MyID; } \
+   { return MyID; } \
 voidClass::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, 
sal_uInt16 nFlags)   \
 {   \
 SfxChildWinFactory *pFact = new SfxChildWinFactory( \
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index f455d84..0f8eae2 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -56,7 +56,6 @@ class SfxHintPoster: public SvRefBase
 GenLink aLink;
 
 private:
-voidRegisterEvent();
 DECL_LINK( DoEvent_Impl, SfxHint * );
 
 protected:
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 62ebce6..08acfa6 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -56,7 +56,6 @@ public:
 SfxMenuControl( sal_uInt16, SfxBindings);
 
 static SfxMenuControl*  CreateImpl( sal_uInt16 nId, Menu rMenu, 
SfxBindings rBindings );
-static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule 
*pMod=NULL );
 
 ~SfxMenuControl();
 
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 6dbdcfa..2f397c3 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -66,7 +66,6 @@ public:
 voidSuspend();
 sal_BoolIsSuspended() const { return bSuspended; }
 
-voidLock();
 voidUnLock();
 voidReschedule();
 
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 3a16624..fbc6c77 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -118,10 +118,6 @@ void SfxApplication::PreInit( )
 {
 }
 
-void SfxApplication::Main( )
-{
-}
-
 //-
 
 SfxFilterMatcher SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index d6fb779..22025a6 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -461,45 +461,6 @@ void SfxProgress::Suspend()
 
 // ---
 
-void SfxProgress::Lock()
-{
-if( pImp-pActiveProgress ) return;
-// No Reschedule for Embedded-Objects,
-// because we are defenseless against the OLE protocol
-if ( !pImp-xObjSh.Is() )
-{
-for ( SfxObjectShell *pDocSh = SfxObjectShell::GetFirst();
-  pDocSh;
-  pDocSh = SfxObjectShell::GetNext(*pDocSh) )
-{
-SfxObjectCreateMode eMode = pDocSh-GetCreateMode();
-if ( ( eMode == SFX_CREATE_MODE_EMBEDDED ) ||
- ( eMode == SFX_CREATE_MODE_PREVIEW ) )
-{
-DBG( DbgOutf( SfxProgress: not locked because 
EMBEDDED/PREVIEW found ) );
-pImp-bAllowRescheduling = sal_False;
-}
-}
-}
-else
-{
-SfxObjectCreateMode eMode = pImp-xObjSh-GetCreateMode();
-if

[Libreoffice-commits] .: sfx2/inc sfx2/source vcl/source

2012-02-17 Thread Michael Meeks 
 sfx2/inc/sfx2/mnuitem.hxx|1 +
 sfx2/source/menu/mnuitem.cxx |8 
 vcl/source/helper/lazydelete.cxx |   10 ++
 3 files changed, 19 insertions(+)

New commits:
commit 019458b151f402c1f8bbabc90e94987bfe2c32f2
Author: Michael Meeks michael.me...@suse.com
Date:   Sat Feb 18 07:57:01 2012 +

partial revert of unused code removal, and add LINUX guards

diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 08acfa6..62ebce6 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -56,6 +56,7 @@ public:
 SfxMenuControl( sal_uInt16, SfxBindings);
 
 static SfxMenuControl*  CreateImpl( sal_uInt16 nId, Menu rMenu, 
SfxBindings rBindings );
+static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule 
*pMod=NULL );
 
 ~SfxMenuControl();
 
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 32b173e..8b05360 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -246,6 +246,14 @@ SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 
/*nId*/, Menu /*rMenu*/,
 return new SfxMenuControl( sal_True );
 }
 
+#ifndef LINUX
+void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
+{
+RegisterMenuControl( pMod, new SfxMenuCtrlFactory(
+SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
+}
+#endif
+
 //
 void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* 
pFact)
 {
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index d63466e..b160bb8 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -70,6 +70,16 @@ template bool LazyDeletorWindow::is_less( Window* left, 
Window* right )
 return (left != right  right-IsChild( left, sal_True )) ? true : false;
 }
 
+#ifndef LINUX
+// specialized is_less function for Menu
+template bool LazyDeletorMenu::is_less( Menu* left, Menu* right )
+{
+while( left  left != right )
+left = left-ImplGetStartedFrom();
+return left != NULL;
+}
+#endif
+
 DeleteOnDeinitBase::~DeleteOnDeinitBase()
 {
 ImplSVData* pSVData = ImplGetSVData();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-01-28 Thread Ivan Timofeev 
 sfx2/inc/sfx2/dispatch.hxx   |1 -
 sfx2/source/control/dispatch.cxx |   12 +---
 sfx2/source/view/viewfrm.cxx |3 ---
 3 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit ff2c26f586c87452a23f307f4b63568e5276538c
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sat Jan 28 22:06:19 2012 +0400

bUILocked is always false

diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index c517632..5aa01d9 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -198,7 +198,6 @@ public:
 SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const;
 SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell 
**ppShell, const SfxSlot **ppSlot,
   sal_Bool bOwnShellsOnly, 
sal_Bool bModal, sal_Bool bRealSlot=sal_True );
-SAL_DLLPRIVATE void LockUI_Impl( sal_Bool bLock = sal_True );
 SAL_DLLPRIVATE void SetReadOnly_Impl( sal_Bool  bOn );
 SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const;
 SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) 
const;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 5ad8d58..1f722c0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -145,7 +145,6 @@ struct SfxDispatcher_Impl
 std::vectorsal_uInt32 aChildWins;
 sal_uInt16   nActionLevel;  // in EnterAction
 sal_uInt32   nEventId;  // EventId UserEvent
-sal_Bool bUILocked; // Update disconnected (no flicker)
 sal_Bool bNoUI; // UI only from Parent Dispatcher
 sal_Bool bReadOnly; // Document is ReadOnly
 sal_Bool bQuiet;// Only use parent dispatcher
@@ -330,7 +329,6 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
 pImp-bLocked = sal_False;
 pImp-bActive = sal_False;
 pImp-pParent = NULL;
-pImp-bUILocked = sal_False;
 pImp-bNoUI = sal_False;
 pImp-bReadOnly = sal_False;
 pImp-bQuiet = sal_False;
@@ -1305,7 +1303,7 @@ void SfxDispatcher::Update_Impl( sal_Bool bForce )
 
 Flush();
 
-if ( !pImp-pFrame || pImp-bUILocked )
+if ( !pImp-pFrame )
 return;
 
 SFX_APP();  // -Wall is this required???
@@ -2183,14 +2181,6 @@ sal_uInt32 SfxDispatcher::GetObjectBarId( sal_uInt16 
nPos ) const
 return pImp-aObjBars[nPos].nResId;
 }
 
-void SfxDispatcher::LockUI_Impl( sal_Bool bLock )
-{
-sal_Bool bWasLocked = pImp-bUILocked;
-pImp-bUILocked = bLock;
-if ( !bLock  bWasLocked )
-Update_Impl( sal_True );
-}
-
 //-
 void SfxDispatcher::HideUI( sal_Bool bHide )
 {
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b6584e0..e342fad 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1876,9 +1876,6 @@ void SfxViewFrame::SetActiveChildFrame_Impl( SfxViewFrame 
*pViewFrame )
 {
 if ( pViewFrame != pImp-pActiveChild )
 {
-if ( !pImp-pActiveChild )
-GetDispatcher()-LockUI_Impl( sal_False );
-
 pImp-pActiveChild = pViewFrame;
 
 Reference XFramesSupplier  xFrame( GetFrame().GetFrameInterface(), 
UNO_QUERY );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2012-01-20 Thread August Sodora 
 sfx2/inc/sfx2/msgpool.hxx   |3 ---
 sfx2/source/control/msgpool.cxx |   19 ---
 2 files changed, 22 deletions(-)

New commits:
commit c987ddfec57cfe712088ee44f864774ac26ed262
Author: August Sodora aug...@gmail.com
Date:   Fri Jan 20 14:07:55 2012 -0500

Actually this is unused

diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 35d4be6..a110b58 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -40,16 +40,13 @@
 
 class SfxInterface;
 class SfxSlot;
-class SfxSlotType_Impl;
 
 typedef std::basic_string sal_uInt16  SfxSlotGroupArr_Impl;
-typedef std::vectorSfxSlotType_Impl* SfxSlotTypeArr_Impl;
 typedef std::vectorSfxInterface* SfxInterfaceArr_Impl;
 
 class SFX2_DLLPUBLIC SfxSlotPool
 {
 SfxSlotGroupArr_Impl*   _pGroups;
-SfxSlotTypeArr_Impl*_pTypes;
 SfxSlotPool*_pParentPool;
 ResMgr* _pResMgr;
 SfxInterfaceArr_Impl*   _pInterfaces;
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index f49de94..8b6cee9 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -43,19 +43,8 @@
 
 #include sfx2/sfx.hrc
 
-struct SfxSlotType_Impl
-{
-sal_uInt16  nId;
-TypeId  nType;
-
-SfxSlotType_Impl( sal_uInt16 nTheId, TypeId nTheType ):
-nId(nTheId), nType(nTheType)
-{}
-};
-
 SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager )
  : _pGroups(0)
- , _pTypes(0)
  , _pParentPool( pParent )
  , _pResMgr( pResManager )
  , _pInterfaces(0)
@@ -76,12 +65,6 @@ SfxSlotPool::~SfxSlotPool()
 delete pIF;
 delete _pInterfaces;
 delete _pGroups;
-if ( _pTypes )
-{
-for(sal_uInt16 n = 0; n  _pTypes-size(); ++n)
-delete (*_pTypes)[n];
-delete _pTypes;
-}
 }
 
 //
@@ -111,8 +94,6 @@ void SfxSlotPool::RegisterInterface( SfxInterface 
rInterface )
 }
 }
 
-if ( !_pTypes )
-_pTypes = new SfxSlotTypeArr_Impl;
 for ( size_t nFunc = 0; nFunc  rInterface.Count(); ++nFunc )
 {
 SfxSlot *pDef = rInterface[nFunc];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/inc sfx2/source

2011-12-21 Thread August Sodora 
 sfx2/inc/sfx2/dispatch.hxx   |3 -
 sfx2/source/appl/app.cxx |1 
 sfx2/source/appl/appcfg.cxx  |1 
 sfx2/source/control/dispatch.cxx |   86 ---
 4 files changed, 91 deletions(-)

New commits:
commit 073431d26d39216a7f5f85489ecd4eb60806ee88
Author: August Sodora aug...@gmail.com
Date:   Wed Dec 21 08:37:20 2011 -0500

More removal from TTProperties

diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 0591d1f..de65742 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -125,9 +125,6 @@ public:
 
 virtual ~SfxDispatcher();
 
-virtual sal_uInt16  ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** 
ppArgs=0, sal_uInt16 nMode=0 );
-sal_uInt16  ExecuteFunction( sal_uInt16 nSID, const 
SfxItemSet rArgs , sal_uInt16 nMode=0 );
-
 virtual voidSetExecuteMode( sal_uInt16 );
 
 const SfxPoolItem*  Execute( sal_uInt16 nSlot,
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d611d94..81bf1f6 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -138,7 +138,6 @@
 #include unotools/syslocaleoptions.hxx
 #include unotools/syslocale.hxx
 #include framework/addonsoptions.hxx
-#include svtools/ttprops.hxx
 #include unotools/extendedsecurityoptions.hxx
 #include rtl/instance.hxx
 #include rtl/strbuf.hxx
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 8fa9c07..f035e02 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -49,7 +49,6 @@
 
 #define _SVSTDARR_STRINGS
 #include svl/svstdarr.hxx
-#include svtools/ttprops.hxx
 #include sfx2/sfxsids.hrc
 #include sot/exchange.hxx
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 44d0a51..a720354 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -36,7 +36,6 @@
 #include svl/eitem.hxx
 #include svl/undo.hxx
 #include vcl/wrkwin.hxx
-#include svtools/ttprops.hxx
 #include stdio.h
 #include stdarg.h
 #include stdlib.h  // due to bsearch
@@ -995,91 +994,6 @@ void MappedPut_Impl( SfxAllItemSet rSet, const 
SfxPoolItem rItem )
 #define SFX_USE_BINDINGS 0x8000
 #endif
 
-sal_uInt16 SfxDispatcher::ExecuteFunction( sal_uInt16 nSlot, SfxPoolItem 
**pArgs,
-   sal_uInt16 nMode )
-{
-if ( !nMode )
-nMode = pImp-nStandardMode;
-
-// through Bindings/Interceptor? (then the return value is not exact)
-sal_Bool bViaBindings = SFX_USE_BINDINGS == ( nMode  SFX_USE_BINDINGS );
-nMode = ~sal_uInt16(SFX_USE_BINDINGS);
-if ( bViaBindings  GetBindings() )
-return GetBindings()-Execute( nSlot, (const SfxPoolItem **) pArgs, 
nMode )
-? EXECUTE_POSSIBLE
-: EXECUTE_NO;
-
-// otherwise through the Dispatcher
-if ( IsLocked(nSlot) )
-return 0;
-SfxShell *pShell = 0;
-SfxCallMode eCall = SFX_CALLMODE_SYNCHRON;
-sal_uInt16 nRet = EXECUTE_NO;
-const SfxSlot *pSlot = 0;
-if ( GetShellAndSlot_Impl( nSlot, pShell, pSlot, sal_False, sal_False ) )
-{
-// Feasibility test before
-if ( pSlot-IsMode( SFX_SLOT_FASTCALL ) ||
-pShell-CanExecuteSlot_Impl( *pSlot ) )
-nRet = EXECUTE_POSSIBLE;
-
-if ( nMode == EXECUTEMODE_ASYNCHRON )
-eCall = SFX_CALLMODE_ASYNCHRON;
-else if ( nMode == EXECUTEMODE_DIALOGASYNCHRON  pSlot-IsMode( 
SFX_SLOT_HASDIALOG ) )
-eCall = SFX_CALLMODE_ASYNCHRON;
-else if ( pSlot-GetMode()  SFX_SLOT_ASYNCHRON )
-eCall = SFX_CALLMODE_ASYNCHRON;
-if ( pArgs  *pArgs )
-{
-SfxAllItemSet aSet( pShell-GetPool() );
-for ( SfxPoolItem **pArg = pArgs; *pArg; ++pArg )
-MappedPut_Impl( aSet, **pArg );
-SfxRequest aReq( nSlot, eCall, aSet );
-_Execute( *pShell, *pSlot, aReq, eCall );
-}
-else
-{
-SfxRequest aReq( nSlot, eCall, pShell-GetPool() );
-_Execute( *pShell, *pSlot, aReq, eCall );
-}
-}
-
-return nRet;
-}
-
-sal_uInt16 SfxDispatcher::ExecuteFunction( sal_uInt16 nSlot, const SfxItemSet 
rArgs,
-   sal_uInt16 nMode )
-{
-if ( !nMode )
-nMode = pImp-nStandardMode;
-
-// otherwise through the Dispatcher
-if ( IsLocked(nSlot) )
-return 0;
-SfxShell *pShell = 0;
-SfxCallMode eCall = SFX_CALLMODE_SYNCHRON;
-sal_uInt16 nRet = EXECUTE_NO;
-const SfxSlot *pSlot = 0;
-if ( GetShellAndSlot_Impl( nSlot, pShell, pSlot, sal_False, sal_False ) )
-{
-// Feasibility test before
-if ( pSlot-IsMode( SFX_SLOT_FASTCALL ) ||
-pShell-CanExecuteSlot_Impl( *pSlot ) )
-nRet = EXECUTE_POSSIBLE;
-
-if ( nMode == EXECUTEMODE_ASYNCHRON )
-eCall = SFX_CALLMODE_ASYNCHRON;
-

[Libreoffice-commits] .: sfx2/inc sfx2/source

2011-11-14 Thread Takeshi Abe 
 sfx2/inc/sfx2/docfilt.hxx|4 ++--
 sfx2/inc/sfx2/fcontnr.hxx|2 +-
 sfx2/source/appl/sfxpicklist.cxx |   36 ++--
 sfx2/source/bastyp/fltfnc.cxx|4 ++--
 sfx2/source/doc/objstor.cxx  |2 +-
 sfx2/source/inc/sfxpicklist.hxx  |   13 +++--
 6 files changed, 31 insertions(+), 30 deletions(-)

New commits:
commit f7319622f63c9dae0eed9e60404d290580fce9fe
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Tue Nov 15 10:57:42 2011 +0900

Revert replaced String in SfxPickList with rtl::OUString

This reverts commit 12df49396e6bcb07bafc95255a8526caac96e60a.

diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index 1da1dea..a951239 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -57,7 +57,7 @@ friend class SfxFilterContainer;
 SfxFilterFlags  nFormatType;
 sal_uInt16  nDocIcon;
 String  aServiceName;
-::rtl::OUString aMimeType;
+String  aMimeType;
 String  aFilterName;
 String  aPattern;
 sal_uIntPtr   nVersion;
@@ -85,7 +85,7 @@ public:
 bool IsInternal() const { return nFormatType  SFX_FILTER_INTERNAL; }
 SfxFilterFlags  GetFilterFlags() const  { return nFormatType; }
 const String   GetFilterName() const { return aFilterName; }
-const ::rtl::OUString GetMimeType() const { return aMimeType; }
+const String   GetMimeType() const { return aMimeType; }
 const String   GetName() const { return  aFilterName; }
 const WildCard GetWildcard() const { return aWildCard; }
 const String   GetRealTypeName() const { return aTypeName; }
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index f6c1d01..a6187a6 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -140,7 +140,7 @@ public:
 sal_uInt32   GuessFilterControlDefaultUI( SfxMedium rMedium, 
const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags 
nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const;
 sal_uInt32   DetectFilter( SfxMedium rMedium, const SfxFilter 
**, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const;
 
-const SfxFilter*GetFilter4Mime( const ::rtl::OUString rMime, 
SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = 
SFX_FILTER_NOTINSTALLED) const;
+const SfxFilter*GetFilter4Mime( const String rMime, SfxFilterFlags 
nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) 
const;
 const SfxFilter*GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags 
nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) 
const;
 const SfxFilter*GetFilter4EA( const String rEA, SfxFilterFlags nMust 
= SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
 const SfxFilter*GetFilter4Extension( const String rExt, 
SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = 
SFX_FILTER_NOTINSTALLED ) const;
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index d80a80c..c3332d9 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -84,30 +84,30 @@ class StringLength : public ::cppu::WeakImplHelper1 
XStringWidth 
 }
 };
 
-void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, 
const ::rtl::OUString aURLString, sal_uInt32 nNo )
+void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, 
const String aURLString, sal_uInt32 nNo )
 {
-::rtl::OUStringBuffer aPickEntry;
+String aPickEntry;
 
 if ( nNo  9 )
 {
-aPickEntry.append('~');
-aPickEntry.append(::rtl::OUString::valueOf(static_castsal_Int32(nNo 
+ 1)));
+aPickEntry += '~';
+aPickEntry += String::CreateFromInt32( nNo + 1 );
 }
 else if ( nNo == 9 )
-aPickEntry.appendAscii(1~0);
+aPickEntry += DEFINE_CONST_UNICODE(1~0);
 else
-aPickEntry.append(::rtl::OUString::valueOf(static_castsal_Int32(nNo 
+ 1)));
-aPickEntry.appendAscii(: );
+aPickEntry += String::CreateFromInt32( nNo + 1 );
+aPickEntry += DEFINE_CONST_UNICODE(: );
 
 INetURLObject   aURL( aURLString );
 rtl::OUString   aTipHelpText;
-rtl::OUString   aAccessibleName = aPickEntry.toString();
+rtl::OUString   aAccessibleName( aPickEntry );
 
 if ( aURL.GetProtocol() == INET_PROT_FILE )
 {
 // Do handle file URL differently = convert it to a system
 // path and abbreviate it with a special function:
-::rtl::OUString aFileSystemPath( aURL.getFSysPath( 
INetURLObject::FSYS_DETECT ) );
+String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) 
);
 
 ::rtl::OUString aSystemPath( aFileSystemPath );
 ::rtl::OUString aCompactedSystemPath;
@@ -116,28 +116,28 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, 
sal_uInt16