ws changes only

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 6149734b948a24dd498f59c7680051d51bb7be5c..e9dbaccf92657c23fd00e66f46378a697148dbc9 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -56,7 +56,6 @@ using lyx::support::MakeAbsPath;
 using lyx::support::MakeDisplayPath;
 using lyx::support::OnlyFilename;
 using lyx::support::OnlyPath;
-using lyx::support::os;
 using lyx::support::Path;
 using lyx::support::removeAutosaveFile;
 using lyx::support::rename;
@@ -67,11 +66,13 @@ using lyx::support::tempName;
 using lyx::support::unlink;
 using lyx::support::user_lyxdir;
 
+namespace os = lyx::support::os;
+
 using std::back_inserter;
 using std::copy;
 using std::endl;
 using std::make_pair;
-
+using std::string;
 using std::ifstream;
 using std::ios;
 using std::istream_iterator;
@@ -426,7 +427,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
 string const getPossibleLabel(BufferView const & bv)
 {
-       ParagraphList::iterator pit = bv.getLyXText()->cursor.par();
+       ParagraphList::iterator pit = bv.getLyXText()->cursorPar();
        ParagraphList & plist = bv.getLyXText()->ownerParagraphs();
 
        LyXLayout_ptr layout = pit->layout();