[Libreoffice-commits] .: sw/source

[Lubos Lunak]

 sw/source/ui/docvw/romenu.cxx |    8 ++++----
 sw/source/ui/docvw/romenu.hxx |    3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit c1a7cbb043fa8fce5e918b23b547c556077f380b
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Mar 1 17:58:59 2011 +0100

    fix last commit

diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 454d24a..b500d68 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -181,8 +181,8 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
             pMenu->CheckItem( MN_READONLY_TOGALLERYLINK,  bGrfToGalleryAsLnk );
             pMenu->CheckItem( MN_READONLY_TOGALLERYCOPY, !bGrfToGalleryAsLnk );
 
-            for (string_const_iterator_t it = aThemeList.begin(); it != aThemeList.end(); ++it)
-                pMenu->InsertItem( MN_READONLY_GRAPHICTOGALLERY+i + 3,*it);
+            for ( USHORT i=0; i < aThemeList.size(); ++i )
+                pMenu->InsertItem( MN_READONLY_GRAPHICTOGALLERY+i + 3, aThemeList[ i ] );
         }
         else
             bEnableGraphicToGallery = false;
@@ -212,8 +212,8 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
                 pMenu->CheckItem( MN_READONLY_TOGALLERYCOPY, !bGrfToGalleryAsLnk );
                 bEnableBackGallery = TRUE;
 
-                for (string_const_iterator_t it = aThemeList.begin(); it != aThemeList.end(); ++it)
-                    pMenu->InsertItem( MN_READONLY_GRAPHICTOGALLERY+i + 3,*it);
+                for ( USHORT i=0; i < aThemeList.size(); ++i )
+                    pMenu->InsertItem( MN_READONLY_GRAPHICTOGALLERY+i + 3, aThemeList[ i ] );
             }
         }
     }
diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx
index 860772e..9101c98 100644
--- a/sw/source/ui/docvw/romenu.hxx
+++ b/sw/source/ui/docvw/romenu.hxx
@@ -41,9 +41,6 @@ class INetImage;
 
 class SwReadOnlyPopup : public PopupMenu
 {
-    typedef std::vector<String>::iterator theme_iterator_t;
-    typedef std::vector<String>::const_iterator theme_const_iterator_t;
-
           SwView &rView;
     const SvxBrushItem *pItem;
     const Point &rDocPos;