[Libreoffice-commits] core.git: 3 commits - fpicker/source fpicker/uiconfig fpicker/UIConfig_fps.mk officecfg/registry svtools/uiconfig svtools/UIConfig_svt.mk
Maxim Monastirsky
momonasmon at gmail.com
Thu Jul 16 05:14:35 PDT 2015
fpicker/UIConfig_fps.mk | 1
fpicker/source/office/RemoteFilesDialog.cxx | 5
fpicker/uiconfig/ui/remotefilesdialog.ui | 241 ++++++++++
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 8
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 8
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 8
svtools/UIConfig_svt.mk | 1
svtools/uiconfig/ui/remotefilesdialog.ui | 241 ----------
8 files changed, 253 insertions(+), 260 deletions(-)
New commits:
commit 383b75f4f516d6a5d256ffc08bc0e7836520447b
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Thu Jul 16 15:00:50 2015 +0300
Hopefully get the right dispose order
warn:legacy.osl:9070:1:vcl/source/window/window.cxx:281:
Window ( 17FileViewContainer()) with live children destroyed:
11SvtFileView() 8Splitter() 10FolderTree()
Change-Id: I6be256337123fc1c3ff2651bcd9f695c8918bb8e
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 9c37347..716c229 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -36,6 +36,7 @@ class FileViewContainer : public vcl::Window
virtual void dispose() SAL_OVERRIDE
{
m_pFileView.clear();
+ m_pTreeView.clear();
m_pSplitter.clear();
vcl::Window::dispose();
}
@@ -248,10 +249,10 @@ void RemoteFilesDialog::dispose()
batch->commit();
- m_pContainer.disposeAndClear(); // container must be first!
m_pTreeView.disposeAndClear();
m_pFileView.disposeAndClear();
m_pSplitter.disposeAndClear();
+ m_pContainer.disposeAndClear();
m_pPath.disposeAndClear();
m_pOk_btn.clear();
commit 85a1a264621a21590e328df735a0b03195b852fc
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Thu Jul 16 13:39:26 2015 +0300
Move OpenRemote to GenericCommands
Change-Id: I43599a484da8983a67d03fca568aa628e7475449
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 3221162..66566f1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1829,14 +1829,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:OpenRemote" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Open Remote File...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:ConvertFormulaToValue" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Formula to Value</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 1f33ada..a8d5d1f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1964,6 +1964,14 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:OpenRemote" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Open Remote File...</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:CircleCut" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Circle Segment</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index c8546eb..f9a866e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2317,14 +2317,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:OpenRemote" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Open Remote File...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
</node>
<node oor:name="Popups">
<node oor:name=".uno:TableMenu" oor:op="replace">
commit eeed180959dc45b5be7facd8bdca5597f6c745b7
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Thu Jul 16 13:32:20 2015 +0300
Move remotefilesdialog.ui to where it belongs
Change-Id: I9afa6c8f7c9de8ed133f714a4726d3f2d01be1db
diff --git a/fpicker/UIConfig_fps.mk b/fpicker/UIConfig_fps.mk
index c558258..ee8fea5 100644
--- a/fpicker/UIConfig_fps.mk
+++ b/fpicker/UIConfig_fps.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,fps))
$(eval $(call gb_UIConfig_add_uifiles,fps,\
fpicker/uiconfig/ui/explorerfiledialog \
fpicker/uiconfig/ui/foldernamedialog \
+ fpicker/uiconfig/ui/remotefilesdialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index d59c9bd..9c37347 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -127,7 +127,7 @@ class FileViewContainer : public vcl::Window
};
RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, WinBits nBits )
- : SvtFileDialog_Base( pParent, "RemoteFilesDialog", "svt/ui/remotefilesdialog.ui" )
+ : SvtFileDialog_Base( pParent, "RemoteFilesDialog", "fps/ui/remotefilesdialog.ui" )
, m_context( comphelper::getProcessComponentContext() )
, m_pSplitter( NULL )
, m_pFileView( NULL )
diff --git a/svtools/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui
similarity index 100%
rename from svtools/uiconfig/ui/remotefilesdialog.ui
rename to fpicker/uiconfig/ui/remotefilesdialog.ui
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk
index bca55c7..dd6182e 100644
--- a/svtools/UIConfig_svt.mk
+++ b/svtools/UIConfig_svt.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\
svtools/uiconfig/ui/placeedit \
svtools/uiconfig/ui/printersetupdialog \
svtools/uiconfig/ui/querydeletedialog \
- svtools/uiconfig/ui/remotefilesdialog \
svtools/uiconfig/ui/restartdialog \
svtools/uiconfig/ui/wizarddialog \
))
More information about the Libreoffice-commits
mailing list