diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-11-02 23:29:27 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-11-02 23:59:36 +0100 |
| commit | 2e803712c4c2b844dab1fefdfbda12058a5f1ab7 (patch) | |
| tree | ead2767e1b9c5d67a9b9fa38bf9ee05af8f65041 /sfx2 | |
| parent | gbuild: LinkTarget: improve gb_LinkTarget__get_headers_check (diff) | |
| download | core-2e803712c4c2b844dab1fefdfbda12058a5f1ab7.tar.gz core-2e803712c4c2b844dab1fefdfbda12058a5f1ab7.zip | |
don't warn for empty VBA structure, fdo#61059
Change-Id: I0d0f7fa216fcea7ca893120ad183dc3758ca51d4
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docmacromode.cxx | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 3969b1c1d7a7..fac3a7bd080b 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -331,25 +331,24 @@ namespace sfx2 else { OUString aStdLibName( "Standard" ); + OUString aVBAProject( "VBAProject" ); Sequence< OUString > aElements = xContainer->getElementNames(); if ( aElements.getLength() ) { - if ( aElements.getLength() > 1 || !aElements[0].equals( aStdLibName ) ) - bHasMacroLib = sal_True; - else + sal_Int32 nElements = aElements.getLength(); + for( sal_Int32 i = 0; i < nElements; ++i ) { - // usually a "Standard" library is always present (design) - // for this reason we must check if it's empty - // - // Note: Since #i73229#, this is not true anymore. There's no default - // "Standard" lib anymore. Wouldn't it be time to get completely - // rid of the "Standard" thingie - this shouldn't be necessary - // anymore, should it? - Reference < XNameAccess > xLib; - Any aAny = xContainer->getByName( aStdLibName ); - aAny >>= xLib; - if ( xLib.is() ) - bHasMacroLib = xLib->hasElements(); + OUString aElement = aElements[i]; + if( aElement == aStdLibName || aElement == aVBAProject ) + { + Reference < XNameAccess > xLib; + Any aAny = xContainer->getByName( aStdLibName ); + aAny >>= xLib; + if ( xLib.is() && xLib->hasElements() ) + return sal_True; + } + else + return sal_True; } } } |