summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-11-15 12:41:16 +0000
committerOliver Bolte <obo@openoffice.org>2004-11-15 12:41:16 +0000
commiteae0dda32494b2219575bf9824ada87c18822a76 (patch)
tree4df3ccb32b4db5780a7742f6228eaa8e7bf82d96
parent09117562546d935ebe4e287217cbc9bdcdc8bc57 (diff)
INTEGRATION: CWS tbe13 (1.46.30); FILE MERGED
2004/10/26 09:05:04 tbe 1.46.30.2: RESYNC: (1.46-1.47); FILE MERGED 2004/10/08 11:22:40 ab 1.46.30.1: #i24094# Check library password before renaming
-rw-r--r--basctl/source/basicide/moduldl2.cxx20
1 files changed, 18 insertions, 2 deletions
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 0d9b678e349f..3e09658bd32c 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: moduldl2.cxx,v $
*
- * $Revision: 1.47 $
+ * $Revision: 1.48 $
*
- * last change: $Author: kz $ $Date: 2004-10-04 19:40:17 $
+ * last change: $Author: obo $ $Date: 2004-11-15 13:41:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -374,6 +374,22 @@ BOOL __EXPORT BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
return FALSE;
}
+ // i24094: Password verification necessary for renaming
+ BOOL bOK = TRUE;
+ if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && !xModLibContainer->isLibraryLoaded( aOULibName ) )
+ {
+ // check password
+ Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY );
+ if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) )
+ {
+ String aPassword;
+ Reference< script::XLibraryContainer > xModLibContainer1( xModLibContainer, UNO_QUERY );
+ bOK = QueryPassword( xModLibContainer1, aLibName, aPassword );
+ }
+ if ( !bOK )
+ return FALSE;
+ }
+
// TODO: check if library is reference/link
// Prueffen, ob Referenz...