dbaccess/source/ui/inc/TableController.hxx | 4 ----
dbaccess/source/ui/tabledesign/TEditControl.cxx | 20 --------------------
dbaccess/source/ui/tabledesign/TEditControl.hxx | 3 ---
dbaccess/source/ui/tabledesign/TableController.cxx | 11 -----------
sw/source/ui/fldui/javaedit.cxx | 7 ++++++-
unusedcode.easy | 5 -----
6 files changed, 6 insertions(+), 44 deletions(-)
New commits:
commit 38a65f76bc944ea730ebac7640dc135248ec3da0
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Feb 4 17:11:14 2015 +0000
Resolves: fdo#68137 crash in traversing script fields
use the same guards as the SwFldEditDlg does
Change-Id: I7d135cf969d9925cec57a90ef0fba8fe40f664eb
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index e67d532..0e27086 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -73,7 +73,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent,
SwWrtShell* pWrtSh) :
aFont.SetWeight( WEIGHT_LIGHT );
m_pEditED->SetFont( aFont );
- pMgr = new SwFldMgr;
+ pMgr = new SwFldMgr(pSh);
pFld = static_cast<SwScriptField*>(pMgr->GetCurFld());
bNew = !(pFld && pFld->GetTyp()->Which() == RES_SCRIPTFLD);
@@ -88,6 +88,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent,
SwWrtShell* pWrtSh) :
SwJavaEditDialog::~SwJavaEditDialog()
{
+ pSh->EnterStdMode();
delete pMgr;
delete pFileDlg;
Application::SetDefDialogParent( pOldDefDlgParent );
@@ -95,6 +96,8 @@ SwJavaEditDialog::~SwJavaEditDialog()
IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl)
{
+ pSh->EnterStdMode();
+
SetFld();
pMgr->GoPrev();
pFld = static_cast<SwScriptField*>(pMgr->GetCurFld());
@@ -107,6 +110,8 @@ IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, PrevHdl)
IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, NextHdl)
{
+ pSh->EnterStdMode();
+
SetFld();
pMgr->GoNext();
pFld = static_cast<SwScriptField*>(pMgr->GetCurFld());
commit 7e1eb03a39b776adf0f479e2801214b1e2d0f6cc
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Feb 4 17:15:02 2015 +0000
callcatcher: remove some more recently discovered unused methods
Change-Id: Ib01e444b24ad9288970066a47f3fcf3dbee1fc49
diff --git a/dbaccess/source/ui/inc/TableController.hxx
b/dbaccess/source/ui/inc/TableController.hxx
index d44aa34..578eb99 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -133,10 +133,6 @@ namespace dbaui
static ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >
SAL_CALL Create(const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >&);
-
- void Load(const ::com::sun::star::uno::Reference<
::com::sun::star::io::XObjectInputStream>& _rxIn);
- void Save(const ::com::sun::star::uno::Reference<
::com::sun::star::io::XObjectOutputStream>& _rxOut);
-
protected:
void startTableListening();
void stopTableListening();
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index ce169f3..ad3e528 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -129,15 +129,6 @@ void OTableEditorCtrl::Init()
RowInserted(0, m_pRowList->size(), true);
}
-void OTableEditorCtrl::UpdateAll()
-{
- RowRemoved(0, GetRowCount(), false);
- m_nDataPos = 0;
-
- InvalidateFeatures();
- Invalidate();
-}
-
OTableEditorCtrl::OTableEditorCtrl(vcl::Window* pWindow)
:OTableRowView(pWindow)
,pNameCell(NULL)
@@ -716,17 +707,6 @@ void OTableEditorCtrl::InvalidateFeatures()
GetView()->getController().InvalidateFeature(SID_SAVEDOC);
}
-void OTableEditorCtrl::Undo()
-{
-
- InvalidateFeatures();
-}
-
-void OTableEditorCtrl::Redo()
-{
- InvalidateFeatures();
-}
-
void OTableEditorCtrl::CopyRows()
{
// set to the right row and save it
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx
b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index cd9f73b..bfae245 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -100,8 +100,6 @@ namespace dbaui
virtual void CellModified() SAL_OVERRIDE;
virtual bool SaveModified() SAL_OVERRIDE; // is called before changing
a cell (false prevents change)
- void Undo();
- void Redo();
virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const
SAL_OVERRIDE;
virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId)
SAL_OVERRIDE;
@@ -125,7 +123,6 @@ namespace dbaui
OTableEditorCtrl(vcl::Window* pParentWin);
virtual ~OTableEditorCtrl();
virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol)
SAL_OVERRIDE;
- void UpdateAll();
SfxUndoManager& GetUndoManager() const;
void SetDescrWin( OTableFieldDescWin* pWin )
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 226c731..493527c 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -643,17 +643,6 @@ void SAL_CALL OTableController::disposing( const
EventObject& _rSource ) throw(R
OTableController_BASE::disposing( _rSource );
}
-void OTableController::Save(const Reference< XObjectOutputStream>& _rxOut)
-{
- OStreamSection aSection(_rxOut.get());
-
-}
-
-void OTableController::Load(const Reference< XObjectInputStream>& _rxIn)
-{
- OStreamSection aSection(_rxIn.get());
-}
-
void OTableController::losingConnection( )
{
// let the base class do it's reconnect
diff --git a/unusedcode.easy b/unusedcode.easy
index 2bbed0e..0d0ec39 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -206,11 +206,6 @@ dbaui::OPropEditCtrl::SetSpecialReadOnly(bool)
dbaui::OPropListBoxCtrl::SetSpecialReadOnly(bool)
dbaui::OQueryViewSwitch::resizeDocumentView(Rectangle&)
dbaui::OQueryViewSwitch::setReadOnly(bool)
-dbaui::OTableController::Load(com::sun::star::uno::Reference<com::sun::star::io::XObjectInputStream>
const&)
-dbaui::OTableController::Save(com::sun::star::uno::Reference<com::sun::star::io::XObjectOutputStream>
const&)
-dbaui::OTableEditorCtrl::Redo()
-dbaui::OTableEditorCtrl::Undo()
-dbaui::OTableEditorCtrl::UpdateAll()
dbaui::OTableRowView::SetUpdatable(bool)
dbaui::OTableWindowAccess::isEditable() const
dbtools::FormattedColumnValue::getColumnUpdate() const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
