diff options
| author | Kai Sommerfeld <kso@openoffice.org> | 2010-01-07 17:58:13 +0100 |
|---|---|---|
| committer | Kai Sommerfeld <kso@openoffice.org> | 2010-01-07 17:58:13 +0100 |
| commit | cb3ace04d096974c0119b830578e219779f7ff96 (patch) | |
| tree | d79000ed38fa1df8b91b2cb22993d3d162b8c9b0 /ucb | |
| parent | f97bbd2ee2a88cc3352b2f059d7180fc0e1f159c (diff) | |
| parent | 64d9903a647efe5cb689fc6ff84175a911b69cfd (diff) | |
rebase to dev300 m69.
Diffstat (limited to 'ucb')
| -rwxr-xr-x | ucb/qa/complex/tdoc/interfaces/makefile.mk | 2 | ||||
| -rwxr-xr-x | ucb/qa/complex/tdoc/makefile.mk | 2 | ||||
| -rwxr-xr-x | ucb/qa/complex/ucb/makefile.mk | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/gio/gio_mount.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ucb/qa/complex/tdoc/interfaces/makefile.mk b/ucb/qa/complex/tdoc/interfaces/makefile.mk index 4656c805fd..e62ec14be2 100755 --- a/ucb/qa/complex/tdoc/interfaces/makefile.mk +++ b/ucb/qa/complex/tdoc/interfaces/makefile.mk @@ -40,7 +40,7 @@ PACKAGE = complex$/tdoc$/interfaces #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = _XChild.java \ _XCommandInfoChangeNotifier.java \ _XCommandProcessor.java \ diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk index 50aada12e7..5a25db74cf 100755 --- a/ucb/qa/complex/tdoc/makefile.mk +++ b/ucb/qa/complex/tdoc/makefile.mk @@ -40,7 +40,7 @@ PACKAGE = complex.tdoc #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = CheckContentProvider.java \ CheckTransientDocumentsContent.java \ CheckTransientDocumentsContentProvider.java \ diff --git a/ucb/qa/complex/ucb/makefile.mk b/ucb/qa/complex/ucb/makefile.mk index 147b1b3064..e0285e70d3 100755 --- a/ucb/qa/complex/ucb/makefile.mk +++ b/ucb/qa/complex/ucb/makefile.mk @@ -40,7 +40,7 @@ PACKAGE = complex$/ucb #----- compile .java files ----------------------------------------- -JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = UCB.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx index 3d1611bd50..4166366c09 100644 --- a/ucb/source/ucp/gio/gio_mount.cxx +++ b/ucb/source/ucp/gio/gio_mount.cxx @@ -68,7 +68,7 @@ static void ooo_mount_operation_class_init (OOoMountOperationClass *klass) using namespace com::sun::star; static void ooo_mount_operation_ask_password (GMountOperation *op, - const char *message, const char *default_user, + const char * /*message*/, const char *default_user, const char *default_domain, GAskPasswordFlags flags) { uno::Reference< task::XInteractionHandler > xIH; |