summaryrefslogtreecommitdiffstats
path: root/libreoffice/3.3.2
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:49:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:49:08 -0600
commit868c146fd385af6c8ee13c5759cc58d1af1b5c9a (patch)
tree5fd74ca59310f668a46954b12ba170e755f3da1b /libreoffice/3.3.2
parent8c5f73ae48a29b136425255cb6cbecb5470f7f1a (diff)
downloadthirdparty-868c146fd385af6c8ee13c5759cc58d1af1b5c9a.tar.gz
thirdparty-868c146fd385af6c8ee13c5759cc58d1af1b5c9a.zip
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/3.3.2')
-rw-r--r--libreoffice/3.3.2/patches/libreoffice-trinity.diff4
1 files changed, 2 insertions, 2 deletions
diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index d660eb9..c9af693 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -9018,10 +9018,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// Main
++//////////////////////////////////////////////////////////////////////////
++
-++static KCmdLineOptions sOptions[] =
+++static TDECmdLineOptions sOptions[] =
++{
++ { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" },
-++ KCmdLineLastOption
+++ TDECmdLineLastOption
++};
++
++int main( int argc, char* argv[] )