Rebased ref, commits from common ancestor:
commit a9fb6fadc82698a6ab1551aed5ae0ef3e526af73
Author: Pranav Kant <pran...@gnome.org>
Date: Mon Jul 6 22:01:30 2015 +0530
lokdocview: [WIP] Call open_document in another thread
This is to keep the widget responsive during heavy LOK calls
being made in the background.
Change-Id: I81acaffc75ca7deddd6cc2de6abae22d009d40cd
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 962f9d9..d536e4a 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -46,7 +46,14 @@ GtkWidget* lok_doc_view_new
(const gchar*
GError
**error);
gboolean lok_doc_view_open_document
(LOKDocView* pDocView,
- const
gchar* pPath);
+ const
gchar* pPath,
+
GCancellable* cancellable,
+
GAsyncReadyCallback callback,
+ gpointer
userdata);
+
+gboolean lok_doc_view_open_document_finish
(LOKDocView* pDocView,
+
GAsyncResult* res,
+ GError**
error);
/// Gets the document the viewer displays.
LibreOfficeKitDocument* lok_doc_view_get_document
(LOKDocView* pDocView);
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index ec70a88..fed62c4 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -41,6 +41,7 @@ std::map<std::string, GtkToolItem*> g_aCommandNameToolItems;
bool g_bToolItemBroadcast = true;
static GtkWidget* pVBox;
static GtkComboBoxText* pPartSelector;
+static GtkWidget* pPartModeComboBox;
/// Should the part selector avoid calling lok::Document::setPart()?
static bool g_bPartSelectorBroadcast = true;
GtkWidget* pFindbar;
@@ -291,6 +292,7 @@ static void signalSearch(LOKDocView* /*pLOKDocView*/, char*
/*pPayload*/, gpoint
gtk_label_set_text(GTK_LABEL(pFindbarLabel), "Search key not found");
}
+
static void signalPart(LOKDocView* /*pLOKDocView*/, int nPart, gpointer
/*pData*/)
{
g_bPartSelectorBroadcast = false;
@@ -380,6 +382,45 @@ static void changePartMode( GtkWidget* pSelector, gpointer
/* pItem */ )
}
}
+
+static void loadStarted(LOKDocView* pDocView, gpointer pData)
+{
+ g_info ("load started");
+}
+
+static void loadFinished(LOKDocView* pDocView, gboolean status, gpointer pData)
+{
+ g_info ("load finished");
+
+ populatePartSelector();
+ populatePartModeSelector( GTK_COMBO_BOX_TEXT(pPartModeComboBox) );
+ // Connect these signals after populating the selectors, to avoid
re-rendering on setting the default part/partmode.
+ g_signal_connect(G_OBJECT(pPartModeComboBox), "changed",
G_CALLBACK(changePartMode), 0);
+ g_signal_connect(G_OBJECT(pPartSelector), "changed",
G_CALLBACK(changePart), 0);
+
+ GList *focusChain = NULL;
+ focusChain = g_list_append( focusChain, pDocView );
+ gtk_container_set_focus_chain ( GTK_CONTAINER (pVBox), focusChain );
+}
+
+static void open_document_cb (GObject* source_object, GAsyncResult* res,
gpointer userdata)
+{
+ LOKDocView* pDocView = LOK_DOC_VIEW (source_object);
+ GError* error = NULL;
+
+ gboolean result = lok_doc_view_open_document_finish(pDocView, res, &error);
+ if (result){
+ g_info ("open_document results to true");
+ }else
+ g_info ("open document results to false");
+
+ if (error != NULL)
+ {
+ g_warning ("Error occurred while opening the document : %s",
error->message);
+ g_error_free (error);
+ }
+}
+
int main( int argc, char* argv[] )
{
if( argc < 3 ||
@@ -435,7 +476,7 @@ int main( int argc, char* argv[] )
gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pSeparator2, -1);
GtkToolItem* pPartModeSelectorToolItem = gtk_tool_item_new();
- GtkWidget* pPartModeComboBox = gtk_combo_box_text_new();
+ pPartModeComboBox = gtk_combo_box_text_new();
gtk_container_add( GTK_CONTAINER(pPartModeSelectorToolItem),
pPartModeComboBox );
gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pPartModeSelectorToolItem, -1 );
@@ -530,6 +571,9 @@ int main( int argc, char* argv[] )
g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
g_signal_connect(pDocView, "hyperlink-clicked",
G_CALLBACK(signalHyperlink), NULL);
+ g_signal_connect(pDocView, "load-started", G_CALLBACK(loadStarted), NULL);
+ g_signal_connect(pDocView, "load-finished", G_CALLBACK(loadFinished),
NULL);
+
// Scrolled window for DocView
pScrolledWindow = gtk_scrolled_window_new(0, 0);
gtk_widget_set_hexpand (pScrolledWindow, TRUE);
@@ -542,21 +586,9 @@ int main( int argc, char* argv[] )
// Hide the findbar by default.
gtk_widget_hide(pFindbar);
- int bOpened = lok_doc_view_open_document( LOK_DOC_VIEW(pDocView), argv[2]
);
+ int bOpened = lok_doc_view_open_document( LOK_DOC_VIEW(pDocView), argv[2],
NULL, open_document_cb, pDocView );
if (!bOpened)
g_error("main: lok_doc_view_open_document() failed");
- assert(lok_doc_view_get_document(LOK_DOC_VIEW(pDocView)));
-
- populatePartSelector();
- populatePartModeSelector( GTK_COMBO_BOX_TEXT(pPartModeComboBox) );
- // Connect these signals after populating the selectors, to avoid
re-rendering on setting the default part/partmode.
- g_signal_connect(G_OBJECT(pPartModeComboBox), "changed",
G_CALLBACK(changePartMode), 0);
- g_signal_connect(G_OBJECT(pPartSelector), "changed",
G_CALLBACK(changePart), 0);
-
- // Make only LOKDocView widget as focussable
- GList *focusChain = NULL;
- focusChain = g_list_append( focusChain, pDocView );
- gtk_container_set_focus_chain ( GTK_CONTAINER (pVBox), focusChain );
gtk_main();
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index bf12ca0..f9b332c 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -108,8 +108,8 @@ struct _LOKDocViewPrivate
enum
{
- LOAD_CHANGED,
- LOAD_FAILED,
+ LOAD_STARTED,
+ LOAD_FINISHED,
EDIT_CHANGED,
COMMAND_CHANGED,
SEARCH_NOT_FOUND,
@@ -1298,6 +1298,34 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
|
G_PARAM_STATIC_STRINGS)));
/**
+ * LOKDocView::load-started:
+ * @pDocView: the #LOKDocView on which the signal is emitted
+ */
+ doc_view_signals[LOAD_STARTED] =
+ g_signal_new("load-started",
+ G_TYPE_FROM_CLASS (pGObjectClass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ /**
+ * LOKDocView::load-finished:
+ * @pDocView: the #LOKDocView on which the signal is emitted
+ * @bStatus: whether the load finished successfully or it failed
+ */
+ doc_view_signals[LOAD_FINISHED] =
+ g_signal_new("load-finished",
+ G_TYPE_FROM_CLASS(pGObjectClass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1,
+ G_TYPE_BOOLEAN);
+
+ /**
* LOKDocView::edit-changed:
* @pDocView: the #LOKDocView on which the signal is emitted
* @bEdit: the new edit value of the view
@@ -1389,15 +1417,29 @@ lok_doc_view_new (const gchar* pPath, GCancellable
*cancellable, GError **error)
}
/**
- * lok_doc_view_open_document:
+ * lok_doc_view_open_document_finish:
* @pDocView: The #LOKDocView instance
* @pPath: The path of the document that #LOKDocView widget should try to open
*
* Returns: %TRUE if the document is loaded succesfully, %FALSE otherwise
*/
SAL_DLLPUBLIC_EXPORT gboolean
-lok_doc_view_open_document (LOKDocView* pDocView, const gchar* pPath)
+lok_doc_view_open_document_finish (LOKDocView* pDocView, GAsyncResult* res,
GError** error)
+{
+ GTask* task = G_TASK(res);
+
+ g_return_val_if_fail(g_task_is_valid(res, pDocView), NULL);
+ //FIXME: make source_tag workx
+ //g_return_val_if_fail(g_task_get_source_tag(task) ==
lok_doc_view_open_document, NULL);
+ g_return_val_if_fail(error == NULL || *error == NULL, NULL);
+
+ return g_task_propagate_boolean(task, error);
+}
+
+static void
+lok_doc_view_open_document_func (GTask* task, gpointer source_object, gpointer
task_data, GCancellable* cancellable)
{
+ LOKDocView* pDocView = LOK_DOC_VIEW(source_object);
LOKDocViewPrivate *priv =
static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
if ( priv->m_pDocument )
@@ -1406,14 +1448,17 @@ lok_doc_view_open_document (LOKDocView* pDocView, const
gchar* pPath)
priv->m_pDocument = 0;
}
+ g_signal_emit(pDocView, doc_view_signals[LOAD_STARTED], 0);
+
priv->m_pOffice->pClass->registerCallback(priv->m_pOffice,
globalCallbackWorker, pDocView);
- priv->m_pDocument = priv->m_pOffice->pClass->documentLoad(
priv->m_pOffice, pPath );
+ priv->m_pDocument = priv->m_pOffice->pClass->documentLoad(
priv->m_pOffice, priv->m_aDocPath );
if ( !priv->m_pDocument )
{
// FIXME: should have a GError parameter and populate it.
char *pError = priv->m_pOffice->pClass->getError( priv->m_pOffice );
fprintf( stderr, "Error opening document '%s'\n", pError );
- return FALSE;
+ g_signal_emit(pDocView, doc_view_signals[LOAD_FINISHED], 0, false/*
implies failure*/);
+ g_task_return_new_error(task, 0, 0, pError);
}
else
{
@@ -1438,8 +1483,38 @@ lok_doc_view_open_document (LOKDocView* pDocView, const
gchar* pPath)
nDocumentHeightPixels);
gtk_widget_set_can_focus(GTK_WIDGET(pDocView), TRUE);
gtk_widget_grab_focus(GTK_WIDGET(pDocView));
+ g_signal_emit(pDocView, doc_view_signals[LOAD_FINISHED], 0, true/*
implies
+
success */);
+ g_task_return_boolean (task, true);
}
- return TRUE;
+}
+
+/**
+ * lok_doc_view_open_document:
+ * @pDocView: The #LOKDocView instance
+ * @pPath: The path of the document that #LOKDocView widget should try to open
+ *
+ * Returns: %TRUE if the document is loaded succesfully, %FALSE otherwise
+ */
+SAL_DLLPUBLIC_EXPORT gboolean
+lok_doc_view_open_document (LOKDocView* pDocView,
+ const gchar* pPath,
+ GCancellable* cancellable,
+ GAsyncReadyCallback callback,
+ gpointer userdata)
+{
+ GTask *task;
+ LOKDocViewPrivate *priv =
static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
+ priv->m_aDocPath = g_strdup(pPath);
+
+ task = g_task_new(pDocView, cancellable, callback, userdata);
+ // FIXME: Use source_tag to check the task.
+ //g_task_set_source_tag(task, lok_doc_view_open_document);
+
+ g_task_run_in_thread(task, lok_doc_view_open_document_func);
+ g_object_unref(task);
+
+ return true;
}
/**
commit 8a54724bce107edf47831cc0a1cb0a963d30913b
Author: Pranav Kant <pran...@gnome.org>
Date: Thu Jul 2 23:47:33 2015 +0530
lokdocview: Grab focus on mouse 'button-press-event'
Change-Id: I65187bbd2cc32d9278d8b3890a82b5555390858a
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 62f1e61..bf12ca0 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -812,6 +812,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget,
GdkEventButton* pEvent)
(int)pEvent->x, (int)pEvent->y,
(int)pixelToTwip(pEvent->x, priv->m_fZoom),
(int)pixelToTwip(pEvent->y, priv->m_fZoom));
+ gtk_widget_grab_focus(GTK_WIDGET(pDocView));
if (pEvent->type == GDK_BUTTON_RELEASE)
{
commit e93b4d20d88ab70489e4daad5e8640b34d06b28f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jul 6 19:24:27 2015 +0200
No MAP_POPULATE on Mac OS X
Change-Id: I6a0b8bbeec94fe19b609542550f9cce783daef20
diff --git a/compilerplugins/clang/unusedmethodsremove.cxx
b/compilerplugins/clang/unusedmethodsremove.cxx
index 9087733..01b71b1 100644
--- a/compilerplugins/clang/unusedmethodsremove.cxx
+++ b/compilerplugins/clang/unusedmethodsremove.cxx
@@ -59,7 +59,7 @@ UnusedMethodsRemove::UnusedMethodsRemove(InstantiationData
const & data): Rewrit
mmapFD = open(sInputFile, O_RDONLY, 0);
assert(mmapFD != -1);
//Execute mmap
- mmappedData = static_cast<char*>(mmap(NULL, mmapFilesize, PROT_READ,
MAP_PRIVATE | MAP_POPULATE, mmapFD, 0));
+ mmappedData = static_cast<char*>(mmap(NULL, mmapFilesize, PROT_READ,
MAP_PRIVATE, mmapFD, 0));
assert(mmappedData != NULL);
}
commit 3004221e47918eb08cfa98ba43a23a0b25412cd5
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sat Apr 18 02:07:58 2015 +0200
preserve whitespaces here, tdf#88137, tdf#89254
Change-Id: Ieabb075b1e324792726a6c67949fbf3e7127615d
Reviewed-on: https://gerrit.libreoffice.org/15375
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/source/filter/excel/xestring.cxx
b/sc/source/filter/excel/xestring.cxx
index 3388048..1404e18 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -413,7 +413,8 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const
if( !IsWriteFormats() )
{
- rWorksheet->startElement( XML_t, FSEND );
+ rWorksheet->startElement( XML_t,
+ FSNS(XML_xml, XML_space), "preserve", FSEND );
rWorksheet->writeEscaped( XclXmlUtils::ToOUString( *this ) );
rWorksheet->endElement( XML_t );
}
commit 2b26c1796d0a05f47cfb01d79ee4f69344efbbb2
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Jul 6 17:49:35 2015 +0200
tdf#92577 sw rendercontext: paint transparent from controls conditionally
Regression from commit beb4aa21d61f0d66392d596be86fb57b4b167239
(SwViewShell::ImplEndAction: avoid direct paint, 2015-06-29), the
problem was that the lcl_PaintTransparentFormControls() call performs
direct paint, so it should be called only in case we don't do an async
paint via invalidate.
As expected, this call is no longer needed for the original i#107365
bug document in case SwViewShell::Paint() will be called by the main
loop shortly.
Change-Id: Ia27c551ed838d610f972f20abbb4ae9f0e1241b6
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b8ed713..950bcac 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -407,8 +407,8 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
{
InvalidateWindows(aRect.SVRect());
}
-
- lcl_PaintTransparentFormControls(*this, aRect); // i#107365
+ else
+ lcl_PaintTransparentFormControls(*this, aRect); //
i#107365
}
pVout.disposeAndClear();
commit 6a01844a9f504c40758daa570724f1983ab1be79
Author: Benjamin Ni <benjaminn...@hotmail.com>
Date: Mon Jul 6 17:35:27 2015 +0200
tdf#92547 - incorrect input values shown in formula wizard
Change-Id: I55dd98b1613376c8e1c83af8ffdc66a58e022cb1
diff --git a/sc/inc/simpleformulacalc.hxx b/sc/inc/simpleformulacalc.hxx
index b701468..340c9d8 100644
--- a/sc/inc/simpleformulacalc.hxx
+++ b/sc/inc/simpleformulacalc.hxx
@@ -41,6 +41,7 @@ public:
void Calculate();
bool IsValue();
+ bool IsMatrix();
sal_uInt16 GetErrCode();
double GetValue();
svl::SharedString GetString();
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 190f522..7c8171c 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6483,6 +6483,12 @@ void Test::testFormulaWizardSubformula()
if ( aFCell.GetErrCode() == 0 )
CPPUNIT_ASSERT_EQUAL( OUString("{1, #DIV/0!, #NAME!}"),
aFCell.GetString().getString() );
+ m_pDoc->SetString(ScAddress(0,1,0), "=NA()"); // B0
+ m_pDoc->SetString(ScAddress(1,1,0), "2"); // B1
+ m_pDoc->SetString(ScAddress(2,1,0), "=1+2"); // B2
+ if ( aFCell.GetErrCode() == 0 )
+ CPPUNIT_ASSERT_EQUAL(OUString("{#N/A, 2, 3}"),
aFCell.GetString().getString());
+
m_pDoc->DeleteTab(0);
}
diff --git a/sc/source/core/data/simpleformulacalc.cxx
b/sc/source/core/data/simpleformulacalc.cxx
index 5a08e68..d359667 100644
--- a/sc/source/core/data/simpleformulacalc.cxx
+++ b/sc/source/core/data/simpleformulacalc.cxx
@@ -70,6 +70,11 @@ bool ScSimpleFormulaCalculator::IsValue()
return maResult.IsValue();
}
+bool ScSimpleFormulaCalculator::IsMatrix()
+{
+ return bIsMatrix;
+}
+
sal_uInt16 ScSimpleFormulaCalculator::GetErrCode()
{
Calculate();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 23023b5..4160619 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -330,7 +330,7 @@ bool ScFormulaDlg::calculateValue( const OUString& rStrExp,
OUString& rStrResult
}
sal_uInt16 nErrCode = pFCell->GetErrCode();
- if ( nErrCode == 0 )
+ if ( nErrCode == 0 || pFCell->IsMatrix() )
{
SvNumberFormatter& aFormatter = *(pDoc->GetFormatTable());
Color* pColor;
commit 1745af7d0a4157ce370d5ef2243f766bd28b6155
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Mon Jul 6 17:54:43 2015 +0300
Set button size before updating the images
So that the sub-toolbar controller will pick the
right image size.
Change-Id: I70b642ac84377b461a001ef11f551a5e1448c0f1
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index ac02170..a6c0efd 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -325,6 +325,8 @@ void ToolBarManager::RefreshImages()
SolarMutexGuard g;
bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
+ m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE :
TOOLBOX_BUTTONSIZE_SMALL );
+
for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
{
sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
@@ -355,7 +357,6 @@ void ToolBarManager::RefreshImages()
}
}
- m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE :
TOOLBOX_BUTTONSIZE_SMALL );
::Size aSize = m_pToolBar->CalcWindowSizePixel();
m_pToolBar->SetOutputSizePixel( aSize );
}
commit 89cc8445f7f76b55e209b8c0c5407b0e592b1117
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jul 6 16:57:03 2015 +0200
Clarify treatment of double slashes in rtl::Uri::convertRelToAbs
Change-Id: I71d0ded04b35472f14e4764a47212c73ac500814
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index e92afe5..191bf5d 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -330,7 +330,11 @@ void Test::test_Uri() {
{ "http://a/b/..";, "../c", "http://a/c"; },
{ "http://a/./b/";, ".././.././../c", "http://a/c"; },
{ "http://a";, "b", "http://a/b"; },
- { "", "http://a/b/../c";, "http://a/c"; } };
+ { "", "http://a/b/../c";, "http://a/c"; },
+
+ { "http://a/b/c";, "d", "http://a/b/d"; },
+ { "http://a/b/c/";, "d", "http://a/b/c/d"; },
+ { "http://a/b/c//";, "d", "http://a/b/c//d"; } };
for (std::size_t i = 0; i < sizeof aRelToAbsTest / sizeof (RelToAbsTest);
++i)
{
rtl::OUString aAbs;
commit dd69bde36a4ee4636933a80c0291486593a37670
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Mon Jul 6 02:50:08 2015 +0300
ToolBarManager: Let XSubToolbarController update itself
The doc for XSubToolbarController::updateImage says:
"gets called to notify a controller that it should set an image
which represents the current selected function.
Only the controller instance is able to set the correct image
for the current function. A toolbar implementation will ask
sub-toolbar controllers to update their image whenever it has
to update the images of all its buttons." However, it didn't
work that way until now.
Steps to reproduce:
1. Open one of the custom shapes dropdowns, and choose a shape
other than the default. Note that the button is now updated
with the last selection.
2. Change the icon theme. Note that the button shows now the
default shape, despite the fact that a future activation
of that button, will still draw the last used shape.
Change-Id: I9345c9faa17dc82a5f590b242b60751ce5d8e648
Reviewed-on: https://gerrit.libreoffice.org/16781
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index fbb1301..ac02170 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -331,13 +331,27 @@ void ToolBarManager::RefreshImages()
if ( nId > 0 )
{
- OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
- Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages
);
- // Try also to query for add-on images before giving up and use an
- // empty image.
- if ( !aImage )
- aImage = QueryAddonsImage( aCommandURL, bBigImages );
- m_pToolBar->SetItemImage( nId, aImage );
+ ToolBarControllerMap::const_iterator pIter =
m_aControllerMap.find( nId );
+ if ( pIter != m_aControllerMap.end() )
+ {
+ Reference< XSubToolbarController > xController( pIter->second,
UNO_QUERY );
+ if ( xController.is() && xController->opensSubToolbar() )
+ {
+ // The button should show the last function that was
selected from the
+ // dropdown. The controller should know better than us
what it was.
+ xController->updateImage();
+ }
+ else
+ {
+ OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
+ Image aImage = GetImageFromURL( m_xFrame, aCommandURL,
bBigImages );
+ // Try also to query for add-on images before giving up
and use an
+ // empty image.
+ if ( !aImage )
+ aImage = QueryAddonsImage( aCommandURL, bBigImages );
+ m_pToolBar->SetItemImage( nId, aImage );
+ }
+ }
}
}
commit ae20b8147307de84318598be72977abc3f7bdda9
Author: Marek Doležel <marekdole...@gmail.com>
Date: Mon Jul 6 15:54:43 2015 +0200
tdf79312: disable auto-close spelling dialog for sw, sd
Change-Id: Ib7ea6624ac6b112779b0e64b08805538b8d6afff
Reviewed-on: https://gerrit.libreoffice.org/16796
Reviewed-by: Samuel Mehrbrodt <s.mehrbr...@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbr...@gmail.com>
diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index e52e3db..574ba97 100644
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -19,9 +19,6 @@
#include "SpellDialogChildWindow.hxx"
#include <svx/svxids.hrc>
-#include <sfx2/app.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
namespace sd{
@@ -77,19 +74,6 @@ svx::SpellPortions
SpellDialogChildWindow::GetNextWrongSentence( bool /*bRecheck
ProvideOutliner();
aResult = mpSdOutliner->GetNextSpellSentence();
}
-
- // Close the spell check dialog when there are no more sentences to
- // check.
- if (aResult.empty())
- {
- SfxBoolItem aItem (SID_SPELL_DIALOG, false);
- GetBindings().GetDispatcher()->Execute(
- SID_SPELL_DIALOG,
- SfxCallMode::ASYNCHRON,
- &aItem,
- 0L);
- }
-
return aResult;
}
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index e29cb22..b6b157d 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -426,13 +426,9 @@ The code below would only be part of the solution.
// take care that the now valid selection is stored
LoseFocus();
}
-
- // close the spelling dialog
- GetBindings().GetDispatcher()->Execute(FN_SPELL_GRAMMAR_DIALOG,
SfxCallMode::ASYNCHRON);
}
}
return aRet;
-
}
void SwSpellDialogChildWindow::ApplyChangedSentence(const svx::SpellPortions&
rChanged, bool bRecheck)
commit e03244c94d83ca5fdd6f3ed62ce7ece4afd51b53
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jul 6 17:31:41 2015 +0300
Fix Funky Capitalisation Of Comments
Change-Id: I2846824d402d029cde8d214f8112047243c79c54
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 3a51c93..0d0a157 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -232,33 +232,33 @@ bool WGLisExtensionSupported(const char *extension)
const size_t extlen = strlen(extension);
const char *supported = NULL;
- // Try To Use wglGetExtensionStringARB On Current DC, If Possible
+ // Try to use wglGetExtensionStringARB on current DC, if possible
PROC wglGetExtString = wglGetProcAddress("wglGetExtensionsStringARB");
if (wglGetExtString)
supported =
((char*(__stdcall*)(HDC))wglGetExtString)(wglGetCurrentDC());
- // If That Failed, Try Standard Opengl Extensions String
+ // If that failed, try standard OpenGL extensions string
if (supported == NULL)
supported = (char*)glGetString(GL_EXTENSIONS);
- // If That Failed Too, Must Be No Extensions Supported
+ // If that failed too, must be no extensions supported
if (supported == NULL)
return false;
- // Begin Examination At Start Of String, Increment By 1 On False Match
+ // Begin examination at start of string, increment by 1 on false match
for (const char* p = supported; ; p++)
{
- // Advance p Up To The Next Possible Match
+ // Advance p up to the next possible match
p = strstr(p, extension);
if (p == NULL)
return 0; // No Match
- // Make Sure That Match Is At The Start Of The String Or That
- // The Previous Char Is A Space, Or Else We Could Accidentally
- // Match "wglFunkywglExtension" With "wglExtension"
+ // Make sure that match is at the start of the string or that
+ // the previous char is a space, or else we could accidentally
+ // match "wglFunkywglExtension" with "wglExtension"
- // Also, Make Sure That The Following Character Is Space Or NULL
- // Or Else "wglExtensionTwo" Might Match "wglExtension"
+ // Also, make sure that the following character is space or null
+ // or else "wglExtensionTwo" might match "wglExtension"
if ((p==supported || p[-1]==' ') && (p[extlen]=='\0' || p[extlen]=='
'))
return 1; // Match
}
@@ -269,37 +269,37 @@ bool InitMultisample(const PIXELFORMATDESCRIPTOR& pfd,
int& rPixelFormat,
{
HWND hWnd = NULL;
GLWindow glWin;
- //create a temp window to check whether support multi-sample, if support,
get the format
+ // Create a temp window to check whether support multi-sample, if support,
get the format
if (InitTempWindow(&hWnd, 1, 1, pfd, glWin) < 0)
{
SAL_WARN("vcl.opengl", "Can't create temp window to test");
return false;
}
- // See If The String Exists In WGL!
+ // See if the string exists in WGL
if (!WGLisExtensionSupported("WGL_ARB_multisample"))
{
- SAL_WARN("vcl.opengl", "Device doesn't support multi sample");
+ SAL_WARN("vcl.opengl", "Device doesn't support multisample");
return false;
}
- // Get Our Pixel Format
+ // Get our pixel format
PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB =
(PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB");
if (!wglChoosePixelFormatARB)
{
return false;
}
- // Get Our Current Device Context
+ // Get our current device context
HDC hDC = GetDC(hWnd);
int pixelFormat;
int valid;
UINT numFormats;
float fAttributes[] = {0,0};
- // These Attributes Are The Bits We Want To Test For In Our Sample
- // Everything Is Pretty Standard, The Only One We Want To
- // Really Focus On Is The SAMPLE BUFFERS ARB And WGL SAMPLES
- // These Two Are Going To Do The Main Testing For Whether Or Not
- // We Support Multisampling On This Hardware.
+ // These attributes are the bits we want to test for in our sample.
+ // Everything is pretty standard, the only one we want to
+ // really focus on is the WGL_SAMPLE_BUFFERS_ARB and WGL_SAMPLES_ARB.
+ // These two are going to do the main testing for whether or not
+ // we support multisampling on this hardware.
int iAttributes[] =
{
WGL_DOUBLE_BUFFER_ARB,GL_TRUE,
@@ -325,9 +325,9 @@ bool InitMultisample(const PIXELFORMATDESCRIPTOR& pfd, int&
rPixelFormat,
bool bArbMultisampleSupported = true;
- // First We Check To See If We Can Get A Pixel Format For 4 Samples
+ // First we check to see if we can get a pixel format for 4 samples
valid = wglChoosePixelFormatARB(hDC, iAttributes, fAttributes, 1,
&pixelFormat, &numFormats);
- // If We Returned True, And Our Format Count Is Greater Than 1
+ // If we returned true, and our format count is greater than 1
if (valid && numFormats >= 1)
{
bArbMultisampleSupported = true;
@@ -338,7 +338,7 @@ bool InitMultisample(const PIXELFORMATDESCRIPTOR& pfd, int&
rPixelFormat,
DestroyWindow(hWnd);
return bArbMultisampleSupported;
}
- // Our Pixel Format With 4 Samples Failed, Test For 2 Samples
+ // Our pixel format with 4 samples failed, test for 2 samples
iAttributes[19] = 2;
valid = wglChoosePixelFormatARB(hDC, iAttributes, fAttributes, 1,
&pixelFormat, &numFormats);
if (valid && numFormats >= 1)
@@ -351,7 +351,7 @@ bool InitMultisample(const PIXELFORMATDESCRIPTOR& pfd, int&
rPixelFormat,
DestroyWindow(hWnd);
return bArbMultisampleSupported;
}
- // Return The Valid Format
+ // Return the valid format
wglMakeCurrent(NULL, NULL);
wglDeleteContext(glWin.hRC);
ReleaseDC(hWnd, glWin.hDC);
@@ -1187,7 +1187,7 @@ void OpenGLContext::initGLWindow(Visual* pVisual)
m_aGLWin.vi = pInfos;
}
- // Check multi sample support
+ // Check multisample support
/* TODO: moggi: This is not necessarily correct in the DBG_UTIL path, as
it picks
* an FBConfig instead ... */
int nSamples = 0;
commit b183507ee293d8bcafa9c1c5b2844b7a83fea17b
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Jul 6 15:16:56 2015 +0200
LOK: Cleanup absolutizing of URLs.
Thanks to Stephan Bergmann.
Change-Id: I22aa3bb827db28bce3eabebb9b8c514663fad860
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3a0ce67..63fe90b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -26,8 +26,9 @@
#include <osl/file.hxx>
#include <osl/process.h>
#include <osl/thread.h>
-#include <rtl/strbuf.hxx>
#include <rtl/bootstrap.hxx>
+#include <rtl/strbuf.hxx>
+#include <rtl/uri.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <comphelper/dispatchcommand.hxx>
#include <comphelper/lok.hxx>
@@ -165,19 +166,21 @@ static OUString getUString(const char* pString)
static OUString getAbsoluteURL(const char* pURL)
{
OUString aURL(getUString(pURL));
-
- // return unchanged if it likely is an URL already
- if (aURL.indexOf("://") > 0)
+ if (aURL.isEmpty())
return aURL;
- OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl;
-
// convert relative paths to absolute ones
- osl_getProcessWorkingDir(&sWorkingDir.pData);
- osl::FileBase::getFileURLFromSystemPath( aURL, sDocPathUrl );
- osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl,
sAbsoluteDocUrl);
+ OUString aWorkingDir;
+ osl_getProcessWorkingDir(&aWorkingDir.pData);
+
+ try {
+ return rtl::Uri::convertRelToAbs(aWorkingDir + "/", aURL);
+ }
+ catch (const rtl::MalformedUriException &)
+ {
+ }
- return sAbsoluteDocUrl;
+ return OUString();
}
extern "C"
@@ -349,6 +352,12 @@ static LibreOfficeKitDocument*
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
SolarMutexGuard aGuard;
OUString aURL(getAbsoluteURL(pURL));
+ if (aURL.isEmpty())
+ {
+ pLib->maLastExceptionMsg = "Filename to load was not provided.";
+ SAL_INFO("lok", "URL for load is empty");
+ return NULL;
+ }
pLib->maLastExceptionMsg.clear();
@@ -415,6 +424,12 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const
char* sUrl, const cha
OUString sFormat = getUString(pFormat);
OUString aURL(getAbsoluteURL(sUrl));
+ if (aURL.isEmpty())
+ {
+ gImpl->maLastExceptionMsg = "Filename to save to was not provided.";
+ SAL_INFO("lok", "URL for save is empty");
+ return false;
+ }
try
{
commit 8468436bf65b05ab77c3414e6cd5d532c6aea1d6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jul 6 15:24:44 2015 +0200
Workaround seems no longer necessary for MSVC 2013
...but C2514 is still there
Change-Id: I818fed066b0ddaf5c30e6057285151d8a575c373
diff --git a/include/com/sun/star/uno/Reference.h
b/include/com/sun/star/uno/Reference.h
index 91db7f5..a4bdf7c 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -181,7 +181,7 @@ private:
struct S { char c[2]; };
-#if defined _MSC_VER
+#if defined _MSC_VER && _MSC_VER < 1800
static char f(T2 *, long);
static S f(T1 * const &, int);
#else
@@ -190,8 +190,8 @@ private:
#endif
struct H {
- H(); // avoid C2514 "class has no constructors" from MSVC 2008
-#if defined _MSC_VER
+ H(); // avoid C2514 "class has no constructors" from MSVC
+#if defined _MSC_VER && _MSC_VER < 1800
operator T1 * const & () const;
#else
operator T1 * () const;
commit 032c0ec6b18718dc2bde580ced9781048a2fdbb9
Author: Noel Grandin <n...@peralex.com>
Date: Mon Jul 6 09:11:44 2015 +0200
loplugin:unusedmethods svl
Change-Id: Ic136cce6abef44291b7236a6d709f0eee391f311
Reviewed-on: https://gerrit.libreoffice.org/16784
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx
b/framework/source/fwe/helper/undomanagerhelper.cxx
index 8b0c9c5..c9b68c7 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -246,7 +246,6 @@ namespace framework
virtual void resetAll() SAL_OVERRIDE;
virtual void listActionEntered( const OUString& i_comment )
SAL_OVERRIDE;
virtual void listActionLeft( const OUString& i_comment ) SAL_OVERRIDE;
- virtual void listActionLeftAndMerged() SAL_OVERRIDE;
virtual void listActionCancelled() SAL_OVERRIDE;
virtual void undoManagerDying() SAL_OVERRIDE;
@@ -840,20 +839,6 @@ namespace framework
notify( i_comment, &XUndoManagerListener::leftContext );
}
- void UndoManagerHelper_Impl::listActionLeftAndMerged()
- {
-#if OSL_DEBUG_LEVEL > 0
- const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top();
- m_aContextAPIFlags.pop();
- OSL_ENSURE( bCurrentContextIsAPIContext == m_bAPIActionRunning,
"UndoManagerHelper_Impl::listActionLeftAndMerged: API and non-API contexts
interwoven!" );
-#endif
-
- if ( m_bAPIActionRunning )
- return;
-
- notify( &XUndoManagerListener::leftHiddenContext );
- }
-
void UndoManagerHelper_Impl::listActionCancelled()
{
#if OSL_DEBUG_LEVEL > 0
diff --git a/include/svl/adrparse.hxx b/include/svl/adrparse.hxx
index e6c08e8..b4e4f1b 100644
--- a/include/svl/adrparse.hxx
+++ b/include/svl/adrparse.hxx
@@ -65,12 +65,6 @@ public:
return nIndex == 0 ? m_aFirst.m_aAddrSpec :
m_aRest[ nIndex - 1 ]->m_aAddrSpec;
}
-
- const OUString& GetRealName(sal_Int32 nIndex) const
- {
- return nIndex == 0 ? m_aFirst.m_aRealName :
- m_aRest[ nIndex - 1 ]->m_aRealName;
- }
};
#endif // INCLUDED_SVL_ADRPARSE_HXX
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index abb9000..11a4e97 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -50,7 +50,6 @@ public:
void SetValue( const OUString& rNewVal );
using SfxPoolItem::Compare;
- virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper&
rIntlWrapper ) const SAL_OVERRIDE;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/currencytable.hxx b/include/svl/currencytable.hxx
index ed2e5f4..44ead72 100644
--- a/include/svl/currencytable.hxx
+++ b/include/svl/currencytable.hxx
@@ -23,7 +23,6 @@ public:
typedef DataType::const_iterator const_iterator;
iterator begin();
- const_iterator begin() const;
NfCurrencyEntry& operator[] ( size_t i );
const NfCurrencyEntry& operator[] ( size_t i ) const;
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 0897ab5..e8e321c 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -48,9 +48,6 @@ public:
virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE;
- virtual int Compare(SfxPoolItem const & rWith,
- IntlWrapper const & rIntlWrapper) const SAL_OVERRIDE;
-
virtual bool GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
OUString & rText,
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index f66634d..cd949fb 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -89,7 +89,6 @@ public:
inline SvStream& operator*() const;
- inline void Reset();
sal_uInt32 Close( bool bSeekToEndOfRec = true );
private:
@@ -258,9 +257,6 @@ public:
SfxMiniRecordReader( SvStream *pStream, sal_uInt8 nTag );
inline ~SfxMiniRecordReader();
- inline sal_uInt8 GetTag() const;
- inline bool IsValid() const;
-
inline SvStream& operator*() const;
inline void Skip();
@@ -303,8 +299,6 @@ protected:
sal_uInt16 nTag, sal_uInt8 nCurVer
);
public:
- inline void Reset();
-
sal_uInt32 Close( bool bSeekToEndOfRec = true );
};
@@ -335,14 +329,6 @@ protected:
pStream, SFX_REC_PRETAG_EXT );
}
bool FindHeader_Impl( sal_uInt16 nTypes, sal_uInt16 nTag );
- bool ReadHeader_Impl( sal_uInt16 nTypes );
-
-public:
-
- inline sal_uInt16 GetTag() const;
-
- inline sal_uInt8 GetVersion() const;
- inline bool HasVersion( sal_uInt16 nVersion ) const;
};
/**
@@ -406,10 +392,6 @@ protected:
public:
inline ~SfxMultiFixRecordWriter();
- inline void NewContent();
-
- inline void Reset();
-
sal_uInt32 Close( bool bSeekToEndOfRec = true );
};
@@ -512,9 +494,6 @@ public:
sal_uInt8 nRecordVer );
void NewContent( sal_uInt16 nTag, sal_uInt8 nVersion );
-// private: not possible, since some compilers then make the previous also
private
- void NewContent()
- { OSL_FAIL( "NewContent() only allowed with args" ); }
};
/** Read multiple content items of an existing record
@@ -571,9 +550,6 @@ public:
bool GetContent();
inline sal_uInt16 GetContentTag();
inline sal_uInt8 GetContentVersion() const;
- inline bool HasContentVersion( sal_uInt16 nVersion ) const;
-
- inline sal_uInt32 ContentCount() const;
};
/** create a mini record
@@ -613,12 +589,6 @@ inline SvStream& SfxMiniRecordWriter::operator*() const
return *_pStream;
}
-inline void SfxMiniRecordWriter::Reset()
-{
- _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI );
- _bHeaderOk = false;
-}
-
/** The dtor moves the stream automatically to the position directly behind
the record */
inline SfxMiniRecordReader::~SfxMiniRecordReader()
{
@@ -633,28 +603,6 @@ inline void SfxMiniRecordReader::Skip()
_bSkipped = true;
}
-/** Get the pre-tag of this record
- *
- * The pre-tag might also be SFX_REC_PRETAG_EXT or SFX_REC_PRETAG_EOR.
- * The latter means that in the stream the error code ERRCODE_IO_WRONGFORMAT
- * is set. The former is valid, since extended records are just building on
- * top of SfxMiniRecord.
- *
- * @return The pre-tag
- */
-inline sal_uInt8 SfxMiniRecordReader::GetTag() const
-{
- return _nPreTag;
-}
-
-/** This method allows to check if the record could be recreated successfully
- * from the stream and, hence, was correct for this record type.
- */
-inline bool SfxMiniRecordReader::IsValid() const
-{
- return _nPreTag != SFX_REC_PRETAG_EOR;
-}
-
/** get the owning stream
*
* This method returns the stream in which the record is contained.
@@ -691,30 +639,6 @@ inline sal_uInt32 SfxSingleRecordWriter::Close( bool
bSeekToEndOfRec )
return nRet;
}
-inline void SfxSingleRecordWriter::Reset()
-{
- _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI +
- SFX_REC_HEADERSIZE_SINGLE );
- _bHeaderOk = false;
-}
-
-/** @returns the tag for the overall record (stored in the record's head) */
-inline sal_uInt16 SfxSingleRecordReader::GetTag() const
-{
- return _nRecordTag;
-}
-
-/** @returns version of the record */
-inline sal_uInt8 SfxSingleRecordReader::GetVersion() const
-{
- return _nRecordVer;
-}
-
-/** determine if the read record has at least the given version */
-inline bool SfxSingleRecordReader::HasVersion( sal_uInt16 nVersion ) const
-{
- return _nRecordVer >= nVersion;
-}
/** The destructor closes the record automatically if not done earlier */
inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter()
@@ -724,33 +648,6 @@ inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter()
Close();
}
-/** add a new content into a record
- *
- * @note each, also the first record, must be initialized by this method
- */
-inline void SfxMultiFixRecordWriter::NewContent()
-{
- #ifdef DBG_UTIL
- sal_uLong nOldStartPos;
- // store starting position of the current content - CAUTION: sub classes!
- nOldStartPos = _nContentStartPos;
- #endif
- _nContentStartPos = _pStream->Tell();
-
-#ifdef DBG_UTIL
- // is there a previous content?
- if ( _nContentCount )
- {
- // check if the previous content stays in specified max. size
- DBG_ASSERT( _nContentStartPos - nOldStartPos == _nContentSize,
- "wrong content size detected" );
- }
-#endif
-
- // count how many
- ++_nContentCount;
-}
-
/**
* Creates a SfxMultiMixRecord in the given stream with a separate tags and
* versions of its content parts. The sizes of each part are calculated
@@ -767,14 +664,6 @@ inline SfxMultiMixRecordWriter::SfxMultiMixRecordWriter(
SvStream* pStream,
{
}
-inline void SfxMultiFixRecordWriter::Reset()
-{
- _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI +
- SFX_REC_HEADERSIZE_SINGLE +
- SFX_REC_HEADERSIZE_MULTI );
- _bHeaderOk = false;
-}
-
/** @returns the tag of the last opened content
* @see SfxMultiRecordReder::GetContent()
*/
@@ -791,26 +680,6 @@ inline sal_uInt8 SfxMultiRecordReader::GetContentVersion()
const
return _nContentVer;
}
-/** Determines if the given version is in the last opened content
- *
- * This method checks if the version is contained in the last version of the
- * content that was opened with SfxMultiRecordReder::GetContent().
- *
- * @param nVersion The version to find
- * @return true, if found
- * @see SfxMultiRecordReder::GetContent()
- */
-inline bool SfxMultiRecordReader::HasContentVersion( sal_uInt16 nVersion )
const
-{
- return _nContentVer >= nVersion;
-}
-
-/** @returns number of this record's contents */
-inline sal_uInt32 SfxMultiRecordReader::ContentCount() const
-{
- return _nContentCount;
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index cabfd16..0271f23 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -55,7 +55,6 @@ public:
nVal = nNewVal;
}
bool GetFlag( sal_uInt8 nFlag ) const { return ( (nVal
& ( 1<<nFlag))); }
- void SetFlag( sal_uInt8 nFlag, bool bVal ) { if(bVal)
{ nVal |= (1<<nFlag); } else { nVal &= ~(1<<nFlag);};}
};
#endif
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index 3fcca5e..fd4ff03 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -96,14 +96,6 @@ public:
if (QueryProtocol (rUrl.GetProtocol()))
PutUrl_Impl (rUrl);
}
-
- void PutUrl (const OUString &rUrl)
- {
- INetProtocol eProto =
- INetURLObject::CompareProtocolScheme (rUrl);
- if (QueryProtocol (eProto))
- PutUrl_Impl (INetURLObject (rUrl));
- }
};
// broadcasted from PutUrl().
diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx
index 9c7ebd5..45e6a8a 100644
--- a/include/svl/int64item.hxx
+++ b/include/svl/int64item.hxx
@@ -27,7 +27,6 @@ public:
virtual bool operator== ( const SfxPoolItem& rItem ) const SAL_OVERRIDE;
virtual int Compare( const SfxPoolItem& r ) const SAL_OVERRIDE;
- virtual int Compare( const SfxPoolItem& r, const IntlWrapper& rIntlWrapper
) const SAL_OVERRIDE;
virtual bool GetPresentation(
SfxItemPresentation, SfxMapUnit, SfxMapUnit,
diff --git a/include/svl/itemiter.hxx b/include/svl/itemiter.hxx
index 691a734..30b6bd1 100644
--- a/include/svl/itemiter.hxx
+++ b/include/svl/itemiter.hxx
@@ -43,18 +43,12 @@ public:
m_nCurrent = m_nStart;
return m_rSet.m_nCount ? *(m_rSet.m_pItems + m_nCurrent) : nullptr;
}
- const SfxPoolItem* LastItem()
- {
- m_nCurrent = m_nEnd;
- return m_rSet.m_nCount ? *(m_rSet.m_pItems + m_nCurrent) : nullptr;
- }
const SfxPoolItem* GetCurItem()
{
return m_rSet.m_nCount ? *(m_rSet.m_pItems + m_nCurrent) : nullptr;
}
const SfxPoolItem* NextItem();
- bool IsAtStart() const { return m_nCurrent == m_nStart; }
bool IsAtEnd() const { return m_nCurrent == m_nEnd; }
sal_uInt16 GetCurPos() const { return m_nCurrent; }
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 39f0b79..efc1c4a 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -210,7 +210,6 @@ public:
sal_uInt16 nOldStart,
sal_uInt16 nOldEnd,
const sal_uInt16
*pWhichIdTab );
sal_uInt16 GetNewWhich( sal_uInt16 nOldWhich ) const;
- sal_uInt16 GetVersion() const;
void SetFileFormatVersion( sal_uInt16
nFileFormatVersion );
bool IsCurrentVersionLoading() const;
diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx
index 1dbf15a..ed809fa 100644
--- a/include/svl/listener.hxx
+++ b/include/svl/listener.hxx
@@ -51,7 +51,6 @@ public:
bool StartListening( SvtBroadcaster& rBroadcaster );
bool EndListening( SvtBroadcaster& rBroadcaster );
void EndListeningAll();
- bool IsListening( SvtBroadcaster& rBroadcaster ) const;
void CopyAllBroadcasters( const SvtListener& r );
bool HasBroadcaster() const;
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index a4ab2a7..8046eda 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -88,9 +88,6 @@ public:
SvxMacroTableDtor& operator=( const SvxMacroTableDtor &rCpy );
bool operator==( const SvxMacroTableDtor& rOther ) const;
- // deletes all entries
- void clear() { aSvxMacroTable.clear(); }
-
SvStream& Read( SvStream &, sal_uInt16 nVersion =
SVX_MACROTBL_AKTVERSION );
SvStream& Write( SvStream & ) const;
@@ -145,7 +142,6 @@ public:
inline const SvxMacro& GetMacro( sal_uInt16 nEvent ) const;
inline bool HasMacro( sal_uInt16 nEvent ) const;
void SetMacro( sal_uInt16 nEvent, const SvxMacro& );
- inline bool DelMacro( sal_uInt16 nEvent );
private:
SvxMacroTableDtor aMacroTable;
@@ -170,10 +166,6 @@ inline const SvxMacro& SvxMacroItem::GetMacro( sal_uInt16
nEvent ) const
{
return *(aMacroTable.Get(nEvent));
}
-inline bool SvxMacroItem::DelMacro( sal_uInt16 nEvent )
-{
- return aMacroTable.Erase(nEvent);
-}
#endif
diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index 2da0414..9e9ddbb 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -94,8 +94,6 @@ public:
bool isInitialized() const { return bInitialized;
}
- bool is() const { return pCurrent != NULL; }
-
void init(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
const LanguageTag& rLanguageTag
@@ -138,21 +136,6 @@ public:
LanguageType getCurrentLanguage() const
{ return eCurrentLanguage; }
- LocaleDataWrapper* getAnyLocale()
- {
- if ( !pAny )
- {
- pAny = new LocaleDataWrapper(
m_xContext, pCurrent->getLanguageTag() );
- eLastAnyLanguage =
eCurrentLanguage;
- }
- else if ( pCurrent != pAny )
- {
- pAny->setLanguageTag(
pCurrent->getLanguageTag() );
- eLastAnyLanguage =
eCurrentLanguage;
- }
- return pAny;
- }
-
const LocaleDataWrapper* get() const { return pCurrent; }
const LocaleDataWrapper* operator->() const { return get(); }
const LocaleDataWrapper& operator*() const { return *get(); }
@@ -191,10 +174,6 @@ public:
delete pPtr;
}
- bool isInitialized() const { return bInitialized;
}
-
- bool is() const { return pPtr != NULL; }
-
void init(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::lang::Locale&
rLocale
@@ -271,8 +250,6 @@ public:
bool isInitialized() const { return bInitialized;
}
- bool is() const { return pPtr != NULL; }
-
void init(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
LanguageType eLang,
@@ -308,15 +285,6 @@ public:
return pPtr;
}
- const ::utl::TransliterationWrapper* getForModule( const OUString&
rModule, LanguageType eLang ) const
- {
- if ( !pPtr )
- pPtr = new
::utl::TransliterationWrapper( m_xContext, nType );
- pPtr->loadModuleByImplName( rModule,
eLang );
- bValid = false; // reforce settings
change in get()
- return pPtr;
- }
-
const ::utl::TransliterationWrapper* operator->() const { return
get(); }
const ::utl::TransliterationWrapper& operator*() const { return
*get(); }
};
@@ -352,8 +320,6 @@ public:
delete pPtr;
}
- bool isInitialized() const { return bInitialized;
}
-
void init(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext
)
@@ -367,8 +333,6 @@ public:
bInitialized = true;
}
- bool is() const { return pPtr != NULL; }
-
NativeNumberWrapper* get() const
{
if ( !pPtr )
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 8a687bf..06c7f7f 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -170,7 +170,6 @@ public:
bool operator!=( const SfxPoolItem& rItem ) const
{ return !(*this == rItem); }
virtual int Compare( const SfxPoolItem &rWith ) const;
- virtual int Compare( const SfxPoolItem &rWith, const
IntlWrapper& rIntlWrapper ) const;
/** @return true if it has a valid string representation */
virtual bool GetPresentation( SfxItemPresentation
ePresentation,
@@ -270,7 +269,6 @@ public:
// create a copy of itself
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
- void SetWhich(sal_uInt16 nWh) { m_nWhich = nWh; }
};
class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index dd6826e..61fcdc8 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -49,10 +49,6 @@ public:
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const
SAL_OVERRIDE;
const Rectangle& GetValue() const { return aVal; }
- void SetValue( const Rectangle& rNewVal ) {
- DBG_ASSERT( GetRefCount() == 0, "SetValue()
with pooled item" );
- aVal = rNewVal;
- }
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const
SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index ac5bd12..1fc7692 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -45,10 +45,6 @@ public:
const IntlWrapper * = 0 ) const
SAL_OVERRIDE;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const
SAL_OVERRIDE;
inline sal_uInt16& From() { return nFrom; }
- inline sal_uInt16 From() const { return nFrom; }
- inline sal_uInt16& To() { return nTo; }
- inline sal_uInt16 To() const { return nTo; }
- inline bool HasRange() const { return nTo>nFrom; }
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion )
const SAL_OVERRIDE;
virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion )
const SAL_OVERRIDE;
};
@@ -73,7 +69,6 @@ public:
OUString &rText,
const IntlWrapper * = 0 ) const
SAL_OVERRIDE;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const
SAL_OVERRIDE;
- inline const sal_uInt16* GetRanges() const { return _pRanges; }
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion )
const SAL_OVERRIDE;
virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion )
const SAL_OVERRIDE;
};
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 9c6be0c..9f2ab1a 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -136,9 +136,6 @@ public:
bool GetPattern() const { return m_bPattern; }
void SetPattern(bool bNewPattern) { m_bPattern =
bNewPattern; }
- bool IsContent() const { return m_bContent; }
- void SetContent( bool bNew ) { m_bContent = bNew; }
-
SfxStyleFamily GetFamily() const { return m_eFamily; }
void SetFamily( SfxStyleFamily eNewFamily )
{ m_eFamily = eNewFamily; }
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 5798b49..43849dd 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -124,9 +124,6 @@ public:
virtual bool HasParentSupport() const; // Default true
virtual bool HasClearParentSupport() const; // Default false
virtual bool IsUsed() const; // Default true
- // Default from the Itemset; either from the passed one
- // or from the Set returned by GetItemSet()
- virtual OUString GetDescription();
virtual OUString GetDescription( SfxMapUnit eMetric );
SfxStyleSheetBasePool& GetPool() { return *pPool; }
@@ -173,7 +170,6 @@ protected:
private:
- sal_uInt16 GetPos() { return nAktPosition; }
SVL_DLLPRIVATE bool IsTrivialSearch();
SfxStyleSheetBase* pAktStyle;
@@ -235,9 +231,6 @@ public:
SfxStyleFamily eFam,
sal_uInt16 nMask = SFXSTYLEBIT_ALL);
- virtual void Replace(
- SfxStyleSheetBase& rSource, SfxStyleSheetBase& rTarget );
-
virtual void Remove( SfxStyleSheetBase* );
void Insert( SfxStyleSheetBase* );
@@ -246,8 +239,6 @@ public:
SfxStyleSheetBasePool& operator=( const SfxStyleSheetBasePool& );
SfxStyleSheetBasePool& operator+=( const SfxStyleSheetBasePool& );
- unsigned GetNumberOfStyles();
-
SfxStyleSheetBase* First();
SfxStyleSheetBase* Next();
virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam,
sal_uInt16 n=SFXSTYLEBIT_ALL );
@@ -318,12 +309,8 @@ enum SfxStyleSheetHintId
class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint
{
- SfxStyleSheetHintId nHint;
-
public:
- SfxStyleSheetPoolHint(SfxStyleSheetHintId nArgHint) :
nHint(nArgHint){}
- SfxStyleSheetHintId GetHint() const
- { return nHint; }
+ SfxStyleSheetPoolHint(SfxStyleSheetHintId ) {}
};
diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx
index 61eca0b..18f3bef 100644
--- a/include/svl/stylepool.hxx
+++ b/include/svl/stylepool.hxx
@@ -67,10 +67,6 @@ public:
IStylePoolIteratorAccess* createIterator( const bool bSkipUnusedItemSets =
false,
const bool
bSkipIgnorableItems = false );
- /** Returns the number of styles
- */
- sal_Int32 getCount() const;
-
virtual ~StylePool();
static OUString nameOf( SfxItemSet_Pointer_t pSet );
@@ -83,7 +79,6 @@ public:
If there is no more SfxItemSet, the delivered share_pointer is empty.
*/
virtual StylePool::SfxItemSet_Pointer_t getNext() = 0;
- virtual OUString getName() = 0;
virtual ~IStylePoolIteratorAccess() {};
};
#endif
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index e807a553..b7aeff9 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -52,11 +52,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const
SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const
SAL_OVERRIDE;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const
SAL_OVERRIDE;
-
- const Size& GetValue() const { return aVal; }
- void SetValue( const Size& rNewVal ) {
- DBG_ASSERT( GetRefCount() == 0, "SetValue()
with pooled item" );
- aVal = rNewVal; }
};
#endif
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 19f1901..bbae41f 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -177,7 +177,6 @@ public:
virtual void resetAll() = 0;
virtual void listActionEntered( const OUString& i_comment ) = 0;
virtual void listActionLeft( const OUString& i_comment ) = 0;
- virtual void listActionLeftAndMerged() = 0;
virtual void listActionCancelled() = 0;
virtual void undoManagerDying() = 0;
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 9a9351e..109b631 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -71,8 +71,6 @@ public:
OUString GetValueTextByVal(bool bTheValue) const;
bool GetValue() const { return m_nValue.bVisible; }
-
- void SetValue(bool bVisible) { m_nValue.bVisible = bVisible; }
};
#endif // INCLUDED_SVL_VISITEM_HXX
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 0127662..df4391f 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -247,7 +247,6 @@ public:
sal_uInt16 GetPositiveFormat() const { return nPositiveFormat; }
sal_uInt16 GetNegativeFormat() const { return nNegativeFormat; }
sal_uInt16 GetDigits() const { return nDigits; }
- sal_Unicode GetZeroChar() const { return cZeroChar; }
/** [$DM-407] (bBank==false) or [$DEM] (bBank==true)
is returned. If bBank==false and
@@ -602,9 +601,6 @@ public:
@ATTENTION! Also clears the old table using ClearMergeTable() */
SvNumberFormatterMergeMap ConvertMergeTableToMap();
- /// Return the last used position ever of a language/country combination
- sal_uInt16 GetLastInsertKey(sal_uInt32 CLOffset);
-
/** Return the format index of a builtin format for a specific
language/country.
If nFormat is not a builtin format nFormat is returned. */
sal_uInt32 GetFormatForLanguageIfBuiltIn( sal_uInt32 nFormat,
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 403ba29..21c106c 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -87,10 +87,9 @@ public:
SvNumberNatNum() : eLang( LANGUAGE_DONTKNOW ), nNum(0),
bDBNum(false), bDate(false),
bSet(false) {}
bool IsComplete() const { return bSet && eLang !=
LANGUAGE_DONTKNOW; }
- sal_uInt8 GetRawNum() const { return nNum; }
- sal_uInt8 GetNatNum() const { return bDBNum ?
MapDBNumToNatNum( nNum, eLang, bDate ) : nNum; }
+ sal_uInt8 GetNatNum() const { return bDBNum ? MapDBNumToNatNum(
nNum, eLang, bDate ) : nNum; }
#ifdef THE_FUTURE
- sal_uInt8 GetDBNum() const { return bDBNum ? nNum :
MapNatNumToDBNum( nNum, eLang, bDate ); }
+ sal_uInt8 GetDBNum() const { return bDBNum ? nNum :
MapNatNumToDBNum( nNum, eLang, bDate ); }
#endif
LanguageType GetLang() const { return eLang; }
void SetLang( LanguageType e ) { eLang = e; }
@@ -200,9 +199,6 @@ public:
const LocaleDataWrapper& rLoc,
bool bDontQuote = false ) const;
- void SetUsed(const bool b) { bIsUsed = b; }
- bool GetUsed() const { return bIsUsed; }
- bool IsStarFormatSupported() const { return bStarFlag; }
void SetStarFormatSupport( bool b ) { bStarFlag = b; }
/**
@@ -384,8 +380,6 @@ public:
or: MM/YY => ('M' << 8) | 'Y' */
sal_uInt32 GetExactDateOrder() const;
- ImpSvNumberformatScan& ImpGetScan() const { return rScan; }
-
// used in XML export
void GetConditions( SvNumberformatLimitOps& rOper1, double& rVal1,
SvNumberformatLimitOps& rOper2, double& rVal2 ) const;
@@ -398,16 +392,6 @@ public:
::com::sun::star::i18n::NativeNumberXmlAttributes& rAttr,
sal_uInt16 nNumFor ) const;
- /** @returns <TRUE/> if E,EE,R,RR,AAA,AAAA in format code of subformat
- nNumFor (0..3) and <b>no</b> preceding calendar was specified and the
- currently loaded calendar is "gregorian". */
- bool IsOtherCalendar( sal_uInt16 nNumFor ) const
- {
- if ( nNumFor < 4 )
- return ImpIsOtherCalendar( NumFor[nNumFor] );
- return false;
- }
-
/** Switches to the first non-"gregorian" calendar, but only if the current
calendar is "gregorian"; original calendar name and date/time returned,
but only if calendar switched and rOrgCalendar was empty. */
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index c68a8c6..c703193 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
@@ -32,7 +32,6 @@
#define SFX_REC_PRE(n) ( ((n) & 0x000000FF) )
#define SFX_REC_OFS(n) ( ((n) & 0xFFFFFF00) >> 8 )
#define SFX_REC_TYP(n) ( ((n) & 0x000000FF) )
-#define SFX_REC_VER(n) ( ((n) & 0x0000FF00) >> 8 )
#define SFX_REC_TAG(n) ( ((n) & 0xFFFF0000) >> 16 )
#define SFX_REC_CONTENT_VER(n) ( ((n) & 0x000000FF) )
@@ -224,37 +223,6 @@ SfxSingleRecordWriter::SfxSingleRecordWriter(sal_uInt8
nRecordType,
/**
*
- * Internal method for reading an SfxMultiRecord header, after
- * the base class has been initialized and its header has been read.
- * Set an error code on the stream if needed, but don't seek back
- * in case of error.
- */
-inline bool SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes )
-{
- bool bRet;
-
- // read header of the base class
- sal_uInt32 nHeader=0;
- _pStream->ReadUInt32( nHeader );
- if ( !SetHeader_Impl( nHeader ) )
- bRet = false;
- else
- {
- // read own header
- _pStream->ReadUInt32( nHeader );
- _nRecordVer = sal::static_int_cast< sal_uInt8 >(SFX_REC_VER(nHeader));
- _nRecordTag = sal::static_int_cast< sal_uInt16 >(SFX_REC_TAG(nHeader));
-
- // wrong record type?
- _nRecordType = sal::static_int_cast< sal_uInt8 >(SFX_REC_TYP(nHeader));
- bRet = 0 != ( nTypes & _nRecordType);
- }
- return bRet;
-}
-
-
-/**
- *
* @param nTypes arithmetic OR of allowed record types
* @param nTag record tag to find
*
diff --git a/svl/source/inc/passwordcontainer.hxx
b/svl/source/inc/passwordcontainer.hxx
index 89961e3..fdef4f4 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -403,8 +403,6 @@ public:
RW_SvMemoryStream( sal_uLong InitSize=512, sal_uLong Resize=64 ):
SvMemoryStream( InitSize, Resize ){}
-
- sal_uLong getActualSize(){ return nEndOfData; }
};
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index a5427df..36eaa98 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -121,16 +121,6 @@ void CntContentTypeItem::SetValue( const OUString& rNewVal
)
CntUnencodedStringItem::SetValue( rNewVal );
}
-int CntContentTypeItem::Compare( const SfxPoolItem &rWith, const IntlWrapper&
rIntlWrapper ) const
-{
- OUString aOwnText, aWithText;
- GetPresentation( SFX_ITEM_PRESENTATION_NAMELESS,
- SFX_MAPUNIT_APPFONT, SFX_MAPUNIT_APPFONT, aOwnText,
&rIntlWrapper );
- rWith.GetPresentation( SFX_ITEM_PRESENTATION_NAMELESS,
- SFX_MAPUNIT_APPFONT, SFX_MAPUNIT_APPFONT,
aWithText, &rIntlWrapper );
- return rIntlWrapper.getCollator()->compareString( aOwnText, aWithText );
-}
-
bool CntContentTypeItem::GetPresentation(
SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 2adf2c7..2ed6d6a 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -48,17 +48,6 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const &
rWith) const
}
// virtual
-int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith,
- IntlWrapper const & rIntlWrapper)
- const
-{
- DBG_ASSERT(rWith.ISA(CntUnencodedStringItem),
- "CntUnencodedStringItem::Compare(): Bad type");
- return rIntlWrapper.getCollator()->compareString( m_aValue,
- static_cast< CntUnencodedStringItem const * >(&rWith)->m_aValue );
-}
-
-// virtual
bool CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit,
SfxMapUnit, OUString & rText,
const IntlWrapper *) const
diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx
index b9be4fb..f884106 100644
--- a/svl/source/items/int64item.cxx
+++ b/svl/source/items/int64item.cxx
@@ -46,11 +46,6 @@ int SfxInt64Item::Compare( const SfxPoolItem& r ) const
return 0;
}
-int SfxInt64Item::Compare( const SfxPoolItem& r, const IntlWrapper&
/*rIntlWrapper*/ ) const
-{
- return Compare(r);
-}
-
bool SfxInt64Item::GetPresentation(
SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString& rText,
const IntlWrapper* /*pIntlWrapper*/ ) const
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index d6480b0..d5bcc71 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -129,12 +129,6 @@ int SfxPoolItem::Compare( const SfxPoolItem& ) const
}
-int SfxPoolItem::Compare( const SfxPoolItem& rWith, const IntlWrapper& ) const
-{
- return Compare( rWith );
-}
-
-
bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const
{
return rCmp.Type() == Type();
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index a9a9ce3..4404a25 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -337,14 +337,6 @@ bool SfxStyleSheetBase::IsUsed() const
/**
* Return set attributes
*/
-OUString SfxStyleSheetBase::GetDescription()
-{
- return GetDescription( SFX_MAPUNIT_CM );
-}
-
-/**
- * Return set attributes
- */
OUString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric )
{
SfxItemIter aIter( GetItemSet() );
@@ -569,16 +561,6 @@ sal_uInt16 SfxStyleSheetIterator::GetSearchMask() const
}
-void SfxStyleSheetBasePool::Replace( SfxStyleSheetBase& rSource,
SfxStyleSheetBase& rTarget )
-{
- rTarget.SetFollow( rSource.GetFollow() );
- rTarget.SetParent( rSource.GetParent() );
- SfxItemSet& rSourceSet = rSource.GetItemSet();
- SfxItemSet& rTargetSet = rTarget.GetItemSet();
- rTargetSet.Intersect( rSourceSet );
- rTargetSet.Put( rSourceSet );
-}
-
SfxStyleSheetIterator& SfxStyleSheetBasePool::GetIterator_Impl()
{
if( !pImp->pIter || (pImp->pIter->GetSearchMask() != nMask) ||
(pImp->pIter->GetSearchFamily() != nSearchFamily) )
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 31fbaf3..dfd564a 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -292,7 +292,6 @@ namespace {
mbSkipIgnorable( bSkipIgnorable )
{}
virtual StylePool::SfxItemSet_Pointer_t getNext() SAL_OVERRIDE;
- virtual OUString getName() SAL_OVERRIDE;
};
StylePool::SfxItemSet_Pointer_t Iterator::getNext()
@@ -327,16 +326,6 @@ namespace {
return pReturn;
}
- OUString Iterator::getName()
- {
- OUString aString;
- if( mpNode && mpNode->hasItemSet( false ) )
- {
- aString = StylePool::nameOf( mpNode->getUsedOrLastAddedItemSet() );
- }
- return aString;
- }
-
}
/**
@@ -386,7 +375,6 @@ public:
// #i86923#
IStylePoolIteratorAccess* createIterator( bool bSkipUnusedItemSets = false,
bool bSkipIgnorableItems = false
);
- sal_Int32 getCount() const { return mnCount; }
};
StylePool::SfxItemSet_Pointer_t StylePoolImpl::insertItemSet( const
SfxItemSet& rSet )
@@ -479,9 +467,6 @@ IStylePoolIteratorAccess* StylePool::createIterator( const
bool bSkipUnusedItemS
return pImpl->createIterator( bSkipUnusedItemSets, bSkipIgnorableItems );
}
-sal_Int32 StylePool::getCount() const
-{ return pImpl->getCount(); }
-
StylePool::~StylePool() { delete pImpl; }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index 9c2a392..52adeb9 100644
--- a/svl/source/notify/listener.cxx
+++ b/svl/source/notify/listener.cxx
@@ -77,11 +77,6 @@ void SvtListener::EndListeningAll()
}
-bool SvtListener::IsListening( SvtBroadcaster& rBroadcaster ) const
-{
- return maBroadcasters.count(&rBroadcaster) > 0;
-}
-
void SvtListener::CopyAllBroadcasters( const SvtListener& r )
{
BroadcastersType aCopy(r.maBroadcasters);
diff --git a/svl/source/numbers/currencytable.cxx
b/svl/source/numbers/currencytable.cxx
index 77745e4..91be75e 100644
--- a/svl/source/numbers/currencytable.cxx
+++ b/svl/source/numbers/currencytable.cxx
@@ -14,11 +14,6 @@ NfCurrencyTable::iterator NfCurrencyTable::begin()
return maData.begin();
}
-NfCurrencyTable::const_iterator NfCurrencyTable::begin() const
-{
- return maData.begin();
-}
-
NfCurrencyEntry& NfCurrencyTable::operator[] ( size_t i )
{
return maData[i];
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 9e8816b..c593320 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -76,7 +76,6 @@ public:
}
const OUString& GetTrueString() const { return GetSpecialKeyword(
NF_KEY_TRUE ); }
const OUString& GetFalseString() const { return GetSpecialKeyword(
NF_KEY_FALSE ); }
- const OUString& GetColorString() const { return
GetKeywords()[NF_KEY_COLOR]; }
const OUString& GetRedString() const { return
GetKeywords()[NF_KEY_RED]; }
const OUString& GetBooleanString() const { return
GetKeywords()[NF_KEY_BOOLEAN]; }
const OUString& GetErrorString() const { return sErrStr; }
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 1298cc6..0507641 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -122,7 +122,6 @@ public:
virtual bool HasFollowSupport() const SAL_OVERRIDE;
virtual bool HasParentSupport() const SAL_OVERRIDE;
virtual bool HasClearParentSupport() const SAL_OVERRIDE;
- virtual OUString GetDescription() SAL_OVERRIDE;
virtual OUString GetDescription(SfxMapUnit eUnit) SAL_OVERRIDE;
SwCharFormat* GetCharFormat();
@@ -199,8 +198,6 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool
public:
SwDocStyleSheetPool( SwDoc&, bool bOrganizer = false );
- virtual void Replace( SfxStyleSheetBase& rSource,
- SfxStyleSheetBase& rTarget ) SAL_OVERRIDE;
virtual SfxStyleSheetBase& Make(const OUString&, SfxStyleFamily,
sal_uInt16 nMask) SAL_OVERRIDE;
diff --git a/sw/source/uibase/app/docstyle.cxx
b/sw/source/uibase/app/docstyle.cxx
index 6aeb0fb..6c1411a 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -935,11 +935,6 @@ OUString SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
return SfxStyleSheetBase::GetDescription(eUnit);
}
-OUString SwDocStyleSheet::GetDescription()
-{
- return GetDescription(SFX_MAPUNIT_CM);
-}
-
// Set names
bool SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow)
{
@@ -2239,100 +2234,6 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Create( const
OUString &,
return NULL;
}
-void SwDocStyleSheetPool::Replace( SfxStyleSheetBase& rSource,
- SfxStyleSheetBase& rTarget )
-{
- SfxStyleFamily eFamily( rSource.GetFamily() );
- if( rSource.HasParentSupport())
- {
- const OUString sParentName = rSource.GetParent();
- if (!sParentName.isEmpty())
- {
- SfxStyleSheetBase* pParentOfNew = Find( sParentName, eFamily );
- if( pParentOfNew )
- rTarget.SetParent( sParentName );
- }
- }
- if( rSource.HasFollowSupport())
- {
- const OUString sFollowName = rSource.GetFollow();
- if (!sFollowName.isEmpty())
- {
- SfxStyleSheetBase* pFollowOfNew = Find( sFollowName, eFamily );
- if( pFollowOfNew )
- rTarget.SetFollow( sFollowName );
- }
- }
-
- SwImplShellAction aTmpSh( rDoc );
-
- bool bSwSrcPool = GetAppName() == rSource.GetPool().GetAppName();
- if( SFX_STYLE_FAMILY_PAGE == eFamily && bSwSrcPool )
- {
- // deal with separately!
- SwPageDesc* pDestDsc =
-
const_cast<SwPageDesc*>(static_cast<SwDocStyleSheet&>(rTarget).GetPageDesc());
- SwPageDesc* pCpyDsc =
-
const_cast<SwPageDesc*>(static_cast<SwDocStyleSheet&>(rSource).GetPageDesc());
- rDoc.CopyPageDesc( *pCpyDsc, *pDestDsc );
- }
- else
- {
- const SwFormat *pSourceFormat = 0;
- SwFormat *pTargetFormat = 0;
- size_t nPgDscPos = SIZE_MAX;
- switch( eFamily )
- {
- case SFX_STYLE_FAMILY_CHAR :
- if( bSwSrcPool )
- pSourceFormat =
static_cast<SwDocStyleSheet&>(rSource).GetCharFormat();
- pTargetFormat =
static_cast<SwDocStyleSheet&>(rTarget).GetCharFormat();
- break;
- case SFX_STYLE_FAMILY_PARA :
- if( bSwSrcPool )
- pSourceFormat =
static_cast<SwDocStyleSheet&>(rSource).GetCollection();
- pTargetFormat =
static_cast<SwDocStyleSheet&>(rTarget).GetCollection();
- break;
- case SFX_STYLE_FAMILY_FRAME:
- if( bSwSrcPool )
- pSourceFormat =
static_cast<SwDocStyleSheet&>(rSource).GetFrameFormat();
- pTargetFormat =
static_cast<SwDocStyleSheet&>(rTarget).GetFrameFormat();
- break;
- case SFX_STYLE_FAMILY_PAGE:
- {
- SwPageDesc *pDesc = rDoc.FindPageDesc(
-
static_cast<SwDocStyleSheet&>(rTarget).GetPageDesc()->GetName(),
- &nPgDscPos );
-
- if( pDesc )
- pTargetFormat = &pDesc->GetMaster();
- }
- break;
- case SFX_STYLE_FAMILY_PSEUDO:
- // A NumRule only consists of one Item, so nothing has
- // to be deleted here.
- break;
- default:; //prevent warning
- }
- if( pTargetFormat )
- {
- if( pSourceFormat )
- pTargetFormat->DelDiffs( *pSourceFormat );
- else if( SIZE_MAX != nPgDscPos )
- pTargetFormat->ResetFormatAttr( RES_PAGEDESC, RES_FRMATR_END-1
);
- else
- {
- // #i73790# - method renamed
- pTargetFormat->ResetAllFormatAttr();
- }
- if( SIZE_MAX != nPgDscPos )
- rDoc.ChgPageDesc( nPgDscPos,
- rDoc.GetPageDesc(nPgDscPos) );
- }
- static_cast<SwDocStyleSheet&>(rTarget).SetItemSet(
rSource.GetItemSet() );
- }
-}
-
SfxStyleSheetIteratorPtr SwDocStyleSheetPool::CreateIterator( SfxStyleFamily
eFam, sal_uInt16 _nMask )
{
return SfxStyleSheetIteratorPtr(new SwStyleSheetIterator( this, eFam,
_nMask ));
commit 593206bda7ae6b522a5f29aef25445722aedeb4c
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jul 3 15:56:19 2015 +0200
loplugin:unusedmethods hwpfilter,i18npool
Change-Id: Ied85d93019d0f6c01c14045758b405f2ac316676
Reviewed-on: https://gerrit.libreoffice.org/16783
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/hwpfilter/source/formula.h b/hwpfilter/source/formula.h
index ebdb1ac..22c53f6 100644
--- a/hwpfilter/source/formula.h
+++ b/hwpfilter/source/formula.h
@@ -68,7 +68,6 @@ private:
void makeSubSup(Node *res);
void makeFraction(Node *res);
void makeDecoration(Node *res);
- void makeFunction(Node *res);
void makeRoot(Node *res);
void makeAccent(Node *res);
void makeParenth(Node *res);
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index ddcd815..4ef9cbf 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -71,11 +71,6 @@ hchar_string HBox::GetString()
}
-hunit HBox::Height(CharShape *csty)
-{
- return( csty->size );
-}
-
// skip block
SkipData::SkipData(hchar hch)
: HBox(hch)
@@ -378,12 +373,6 @@ TxtBox::~TxtBox()
}
-hunit TxtBox::Height(CharShape * csty)
-{
- return (style.anchor_type == CHAR_ANCHOR) ? box_ys : csty->size;
-}
-
-
// picture(11)
Picture::Picture()
@@ -422,12 +411,6 @@ int Picture::Type()
}
-hunit Picture::Height(CharShape * sty)
-{
- return (style.anchor_type == CHAR_ANCHOR) ? box_ys : sty->size;
-}
-
-
// line(14)
// hidden(15)
Hidden::~Hidden()
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 7499bd2..4ceeb27 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -54,10 +54,6 @@ struct HBox
*/
int WSize();
/**
- * @returns The Height of HBox object as hunit value.
- */
- virtual hunit Height(CharShape *csty);
-/**
* Read properties from HIODevice object like stream, file, memory.
*
* @param hwpf HWPFile Object having all information for a hwp file.
@@ -391,8 +387,6 @@ struct TxtBox: public FBox
int Type() { return type; }
virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE;
-
- virtual hunit Height(CharShape *csty) SAL_OVERRIDE;
};
#define ALLOWED_GAP 5
@@ -662,8 +656,6 @@ struct Picture: public FBox
int Type ();
virtual bool Read (HWPFile &hwpf) SAL_OVERRIDE;
-
- virtual hunit Height (CharShape *sty) SAL_OVERRIDE;
};
// line (14)
diff --git a/hwpfilter/source/hinfo.h b/hwpfilter/source/hinfo.h
index 00bc604..0452f42 100644
--- a/hwpfilter/source/hinfo.h
+++ b/hwpfilter/source/hinfo.h
@@ -206,8 +206,6 @@ class DLLEXPORT HWPInfo
~HWPInfo(void);
bool Read(HWPFile &hwpf);
- bool Write(CTextOut &txtf);
- bool Write(CHTMLOut &html);
};
diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h
index 94bd327..7a6c5e3 100644
--- a/hwpfilter/source/hpara.h
+++ b/hwpfilter/source/hpara.h
@@ -117,8 +117,6 @@ class DLLEXPORT HWPPara
~HWPPara(void);
bool Read(HWPFile &hwpf, unsigned char flag = 0);
- int Write(CTextOut &txtf);
- int Write(CHTMLOut &html);
void SetNext(HWPPara *n) { _next = n; };
@@ -133,17 +131,12 @@ class DLLEXPORT HWPPara
ParaShape& GetParaShape(void) { return pshape;}
/**
- * Returns previous paragraph.
- */
- HWPPara *Prev(void);
-/**
* Returns next paragraph.
*/
HWPPara *Next(void) { return _next;}
int HomePos(int line) const;
int EndPos(int line) const;
- int LineLen(int line) const;
private:
HBox *readHBox(HWPFile &);
@@ -165,10 +158,6 @@ inline int HWPPara::EndPos(int line) const
}
-inline int HWPPara::LineLen(int line) const
-{
- return EndPos(line) - HomePos(line);
-}
#endif // INCLUDED_HWPFILTER_SOURCE_HPARA_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index b28c2a4..f044b5d 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -228,12 +228,10 @@ class DLLEXPORT HWPFile
HWPFont& GetHWPFont(void) { return _hwpFont; }
HWPStyle& GetHWPStyle(void) { return _hwpStyle; }
HWPPara *GetFirstPara(void) { return plist.front(); }
- HWPPara *GetLastPara(void) { return plist.back(); }
EmPicture *GetEmPicture(Picture *pic);
EmPicture *GetEmPictureByName(char * name);
HyperText *GetHyperText();
- FBox *GetBoxHead (void) { return blist.size()?blist.front():0; }
ParaShape *getParaShape(int);
CharShape *getCharShape(int);
FBoxStyle *getFBoxStyle(int);
diff --git a/hwpfilter/source/mzstring.h b/hwpfilter/source/mzstring.h
index b5d2656..5a5d606 100644
--- a/hwpfilter/source/mzstring.h
+++ b/hwpfilter/source/mzstring.h
@@ -118,7 +118,6 @@ class MzString
// Access to specific characters
//char &operator [] (int n);
char operator [] (int n);
- char last();
// Comparison
// Return:
@@ -130,8 +129,6 @@ class MzString
// Searching for parts
int find (char c);
int find (char c, int pos);
- int find (char *);
- int find (char *, int pos);
int rfind (char c);
int rfind (char c, int pos);
diff --git a/i18npool/source/search/levdis.hxx
b/i18npool/source/search/levdis.hxx
index d9cb836..e7dcc08 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -183,19 +183,6 @@ public:
bool bRelaxed = true );
inline int GetLimit() const { return nLimit; }
- inline int GetReplaceP0() const { return nRepP0; }
- inline int GetInsertQ0() const { return nInsQ0; }
- inline int GetDeleteR0() const { return nDelR0; }
- inline bool GetSplit() const { return bSplitCount; }
- inline int SetLimit( int nNewLimit );
- inline int SetReplaceP0( int nNewP0 );
- inline int SetInsertQ0( int nNewQ0 );
- inline int SetDeleteR0( int nNewR0 );
- /** SetSplit(true) makes only sense after having called CalcLPQR() for the
- internal weighs! */
- inline bool SetSplit( bool bNewSplit );
-
- inline bool IsNormal( sal_Int32 nPos ) const { return !bpPatIsWild[nPos]; }
// Calculate current balance, keep this inline for performance reasons!
// c == cpPattern[jj] == cString[ii]
@@ -231,40 +218,6 @@ public:
}
};
-inline int WLevDistance::SetLimit( int nNewLimit )
-{
- int nTmp = nLimit;
- nLimit = nNewLimit;
- return nTmp;
-}
-
-inline int WLevDistance::SetReplaceP0( int nNewP0 )
-{
- int nTmp = nRepP0;
- nRepP0 = nNewP0;
- return nTmp;
-}
-
-inline int WLevDistance::SetInsertQ0( int nNewQ0 )
-{
- int nTmp = nInsQ0;
- nInsQ0 = nNewQ0;
- return nTmp;
-}
-
-inline int WLevDistance::SetDeleteR0( int nNewR0 )
-{
- int nTmp = nDelR0;
- nDelR0 = nNewR0;
- return nTmp;
-}
-
-inline bool WLevDistance::SetSplit( bool bNewSplit )
-{
- bool bTmp = bSplitCount;
- bSplitCount = bNewSplit;
- return bTmp;
-}
#endif
commit c4379aacbe9d5732dadf02c2d4306266e162ffc6
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jul 3 15:24:09 2015 +0200
loplugin:unusedmethods sot
Change-Id: I14e8bb3e4e38ade1044ce1c50c9676a65152724c
Reviewed-on: https://gerrit.libreoffice.org/16733
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx
index b5f5ff6..7314e3a 100644
--- a/include/sot/factory.hxx
+++ b/include/sot/factory.hxx
@@ -59,12 +59,6 @@ public:
void PutSuperClass( const SotFactory * );
bool Is( const SotFactory * pSuperClass ) const;
- const SotFactory * GetSuper( sal_uInt16 nPos ) const
- {
- return nPos < nSuperCount ?
- pSuperClasses[ nPos ]
- : NULL;
- }
private:
SotFactory( const SotFactory & ) SAL_DELETED_FUNCTION;
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 8c20856..41077fe 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -35,7 +35,6 @@ friend class SotFactory;
protected:
virtual ~SotObject();
- void SetExtern() { bOwner = false; }
virtual bool Close();
public:
SotObject();
@@ -46,7 +45,6 @@ private:
public:
static void * CreateInstance( SotObject ** = NULL );
static SotFactory * ClassFactory();
- virtual const SotFactory * GetSvFactory() const;
virtual void * Cast( const SotFactory * );
bool Owner() const { return bOwner; }
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 5f4ba36..bfb5702 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -55,7 +55,6 @@ protected:
virtual ~StorageBase();
public:
TYPEINFO();
- virtual const SvStream* GetSvStream() const = 0;
virtual bool Validate( bool=false ) const = 0;
virtual bool ValidateMode( StreamMode ) const = 0;
void ResetError() const;
@@ -80,7 +79,6 @@ public:
virtual sal_uLong GetSize() const = 0;
virtual bool CopyTo( BaseStorageStream * pDestStm ) = 0;
virtual bool Commit() = 0;
- virtual bool Revert() = 0;
virtual bool Equals( const BaseStorageStream& rStream ) const = 0;
};
@@ -98,13 +96,9 @@ public:
virtual void SetClass( const SvGlobalName & rClass,
SotClipboardFormatId
nOriginalClipFormat,
const OUString & rUserTypeName ) = 0;
- virtual void SetConvertClass( const SvGlobalName &
rConvertClass,
- SotClipboardFormatId
nOriginalClipFormat,
- const OUString &
rUserTypeName ) = 0;
virtual SvGlobalName GetClassName() = 0;
virtual SotClipboardFormatId GetFormat() = 0;
virtual OUString GetUserName() = 0;
- virtual bool ShouldConvert() = 0;
virtual void FillInfoList( SvStorageInfoList* ) const = 0;
virtual bool CopyTo( BaseStorage* pDestStg ) const = 0;
virtual bool Commit() = 0;
@@ -127,7 +121,6 @@ public:
virtual bool Remove( const OUString & rEleName ) = 0;
virtual bool Rename( const OUString & rEleName, const
OUString & rNewName ) = 0;
virtual bool CopyTo( const OUString & rEleName, BaseStorage
* pDest, const OUString & rNewName ) = 0;
- virtual bool MoveTo( const OUString & rEleName, BaseStorage
* pDest, const OUString & rNewName ) = 0;
virtual bool ValidateFAT() = 0;
virtual bool Equals( const BaseStorage& rStream ) const = 0;
};
@@ -164,10 +157,8 @@ public:
virtual sal_uLong GetSize() const SAL_OVERRIDE;
virtual bool CopyTo( BaseStorageStream * pDestStm ) SAL_OVERRIDE;
virtual bool Commit() SAL_OVERRIDE;
- virtual bool Revert() SAL_OVERRIDE;
virtual bool Validate( bool=false ) const SAL_OVERRIDE;
virtual bool ValidateMode( StreamMode ) const SAL_OVERRIDE;
- const SvStream* GetSvStream() const SAL_OVERRIDE;
virtual bool Equals( const BaseStorageStream& rStream ) const
SAL_OVERRIDE;
};
@@ -198,13 +189,9 @@ public:
virtual void SetClass( const SvGlobalName & rClass,
SotClipboardFormatId
nOriginalClipFormat,
const OUString & rUserTypeName )
SAL_OVERRIDE;
- virtual void SetConvertClass( const SvGlobalName &
rConvertClass,
- SotClipboardFormatId
nOriginalClipFormat,
- const OUString &
rUserTypeName ) SAL_OVERRIDE;
virtual SvGlobalName GetClassName() SAL_OVERRIDE;
virtual SotClipboardFormatId GetFormat() SAL_OVERRIDE;
virtual OUString GetUserName() SAL_OVERRIDE;
- virtual bool ShouldConvert() SAL_OVERRIDE;
virtual void FillInfoList( SvStorageInfoList* ) const
SAL_OVERRIDE;
virtual bool CopyTo( BaseStorage* pDestStg ) const
SAL_OVERRIDE;
virtual bool Commit() SAL_OVERRIDE;
@@ -227,12 +214,10 @@ public:
virtual bool Remove( const OUString & rEleName )
SAL_OVERRIDE;
virtual bool Rename( const OUString & rEleName, const
OUString & rNewName ) SAL_OVERRIDE;
virtual bool CopyTo( const OUString & rEleName, BaseStorage
* pDest, const OUString & rNewName ) SAL_OVERRIDE;
- virtual bool MoveTo( const OUString & rEleName, BaseStorage
* pDest, const OUString & rNewName ) SAL_OVERRIDE;
virtual bool ValidateFAT() SAL_OVERRIDE;
virtual bool Validate( bool=false ) const SAL_OVERRIDE;
virtual bool ValidateMode( StreamMode ) const SAL_OVERRIDE;
bool ValidateMode( StreamMode, StgDirEntry* p )
const;
- virtual const SvStream* GetSvStream() const SAL_OVERRIDE;
virtual bool Equals( const BaseStorage& rStream ) const
SAL_OVERRIDE;
};
@@ -259,10 +244,8 @@ public:
virtual sal_uLong GetSize() const SAL_OVERRIDE;
virtual bool CopyTo( BaseStorageStream * pDestStm )
SAL_OVERRIDE;
virtual bool Commit() SAL_OVERRIDE;
- virtual bool Revert() SAL_OVERRIDE;
virtual bool Validate( bool=false ) const SAL_OVERRIDE;
virtual bool ValidateMode( StreamMode ) const SAL_OVERRIDE;
- const SvStream* GetSvStream() const SAL_OVERRIDE;
virtual bool Equals( const BaseStorageStream& rStream )
const SAL_OVERRIDE;
bool SetProperty( const OUString& rName, const
::com::sun::star::uno::Any& rValue );
@@ -312,13 +295,9 @@ public:
virtual void SetClass( const SvGlobalName & rClass,
SotClipboardFormatId
nOriginalClipFormat,
const OUString & rUserTypeName )
SAL_OVERRIDE;
- virtual void SetConvertClass( const SvGlobalName &
rConvertClass,
- SotClipboardFormatId
nOriginalClipFormat,
- const OUString &
rUserTypeName ) SAL_OVERRIDE;
virtual SvGlobalName GetClassName() SAL_OVERRIDE;
virtual SotClipboardFormatId GetFormat() SAL_OVERRIDE;
virtual OUString GetUserName() SAL_OVERRIDE;
- virtual bool ShouldConvert() SAL_OVERRIDE;
virtual void FillInfoList( SvStorageInfoList* ) const
SAL_OVERRIDE;
virtual bool CopyTo( BaseStorage* pDestStg ) const
SAL_OVERRIDE;
virtual bool Commit() SAL_OVERRIDE;
@@ -341,13 +320,10 @@ public:
virtual bool Remove( const OUString & rEleName )
SAL_OVERRIDE;
virtual bool Rename( const OUString & rEleName, const
OUString & rNewName ) SAL_OVERRIDE;
virtual bool CopyTo( const OUString & rEleName, BaseStorage
* pDest, const OUString & rNewName ) SAL_OVERRIDE;
- virtual bool MoveTo( const OUString & rEleName, BaseStorage
* pDest, const OUString & rNewName ) SAL_OVERRIDE;
virtual bool ValidateFAT() SAL_OVERRIDE;
virtual bool Validate( bool=false ) const SAL_OVERRIDE;
virtual bool ValidateMode( StreamMode ) const SAL_OVERRIDE;
- virtual const SvStream* GetSvStream() const SAL_OVERRIDE;
virtual bool Equals( const BaseStorage& rStream ) const
SAL_OVERRIDE;
- bool GetProperty( const OUString& rEleName, const
OUString& rName, ::com::sun::star::uno::Any& rValue );
UCBStorageElement_Impl* FindElement_Impl( const OUString& rName )
const;
bool CopyStorageElement_Impl(
UCBStorageElement_Impl& rElement,
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 0850bde..8d0bcc8 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -62,7 +62,6 @@ private:
public:
static void * CreateInstance( SotObject ** = NULL );
static SotFactory * ClassFactory();
- virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE;
virtual void * Cast( const SotFactory * ) SAL_OVERRIDE;
virtual void ResetError() SAL_OVERRIDE;
@@ -116,7 +115,6 @@ private:
public:
static void * CreateInstance( SotObject ** = NULL );
static SotFactory * ClassFactory();
- virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE;
virtual void * Cast( const SotFactory * ) SAL_OVERRIDE;
SvMemoryStream * CreateMemoryStream();
@@ -139,7 +137,6 @@ public:
return m_nVersion;
}
- sal_uLong GetErrorCode() const { return m_nError; }
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
