summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-08 10:59:05 +0100
committerAndras Timar <andras.timar@collabora.com>2013-11-05 11:50:44 +0100
commit3a311ccf1f26adbf3ef5deebc9bb7401441170b8 (patch)
tree2d0ad8fd2da076a0399a4c4f130e974bfc62dc08
parent2dc843a43eb3bcf1178a3cea2913b01186148671 (diff)
-Werror=unused-local-typedefs (GCC 4.8)
(cherry picked from commit 52c5eb20fd96d63e17cb9cd18912030131bcc787) Conflicts: sd/source/ui/toolpanel/controls/MasterPageObserver.cxx Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx1
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx2
2 files changed, 0 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 33db97de4683..fd9ce4935d52 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -605,7 +605,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
putenv(strdup(osJavaHome.getStr()));
#endif
- typedef jint JNICALL JNI_InitArgs_Type(void *);
typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *);
rtl::OUString sSymbolCreateJava(
RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM"));
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 8c4f129c203f..2694218cdf2d 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -201,8 +201,6 @@ void ClientBox::DeleteRemoved()
if ( ! m_vRemovedEntries.empty() )
{
- typedef std::vector< TClientBoxEntry >::iterator ITER;
-
m_vRemovedEntries.clear();
}